Changeset 2d3b010 in git


Ignore:
Timestamp:
Sep 15, 2014, 5:07:46 PM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
922890d232f31c404a7e6e8fb0b4328c0bad1252
Parents:
750a0ef0a22f27fddb8987152aad2b122395dd60
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-09-15 17:07:46+02:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-09-15 17:09:12+02:00
Message:
fix: wrong ring used internally: add ring to scMult0Int
Location:
kernel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/GBEngine/kstd1.cc

    r750a0e r2d3b010  
    17441744    {
    17451745      if ((TEST_OPT_FINDET)
    1746       || ((TEST_OPT_MULTBOUND) && (scMult0Int((strat->Shdl)) < Kstd1_mu)))
     1746      || ((TEST_OPT_MULTBOUND) && (scMult0Int(strat->Shdl,NULL,strat->tailRing) < Kstd1_mu)))
    17471747      {
    17481748        // obachman: is this still used ???
  • kernel/GBEngine/stairc.h

    r750a0e r2d3b010  
    2121int scDimInt(ideal  s,ideal Q=NULL);
    2222int scMultInt(ideal  s,ideal Q=NULL);
    23 int scMult0Int(ideal  s,ideal Q=NULL);
     23int scMult0Int(ideal  s,ideal Q=NULL, const ring r=currRing);
    2424void scPrintDegree(int co, int mu);
    2525void scDegree(ideal  s,intvec *modulweight,ideal Q=NULL);
  • kernel/combinatorics/hdegree.cc

    r750a0e r2d3b010  
    829829}
    830830
    831 static void hDegree0(ideal S, ideal Q)
     831static void hDegree0(ideal S, ideal Q, const ring r=currRing)
    832832{
    833833  int  mc;
     
    841841    hMu = 0;
    842842  hwork = (scfmon)omAlloc(hNexist * sizeof(scmon));
    843   hvar = (varset)omAlloc(((currRing->N) + 1) * sizeof(int));
    844   hpur0 = (scmon)omAlloc((1 + ((currRing->N) * (currRing->N))) * sizeof(int));
     843  hvar = (varset)omAlloc(((r->N) + 1) * sizeof(int));
     844  hpur0 = (scmon)omAlloc((1 + ((r->N) * (r->N))) * sizeof(int));
    845845  mc = hisModule;
    846846  if (!mc)
     
    851851  else
    852852    hstc = (scfmon)omAlloc(hNexist * sizeof(scmon));
    853   stcmem = hCreate((currRing->N) - 1);
     853  stcmem = hCreate((r->N) - 1);
    854854  loop
    855855  {
     
    863863      }
    864864    }
    865     hNvar = (currRing->N);
     865    hNvar = (r->N);
    866866    for (int i = hNvar; i; i--)
    867867      hvar[i] = i;
    868868    hStaircase(hstc, &hNstc, hvar, hNvar);
    869869    hSupp(hstc, hNstc, hvar, &hNvar);
    870     if ((hNvar == (currRing->N)) && (hNstc >= (currRing->N)))
     870    if ((hNvar == (r->N)) && (hNstc >= (r->N)))
    871871    {
    872872      if ((hNvar > 2) && (hNstc > 10))
    873873        hOrdSupp(hstc, hNstc, hvar, hNvar);
    874       memset(hpur0, 0, ((currRing->N) + 1) * sizeof(int));
     874      memset(hpur0, 0, ((r->N) + 1) * sizeof(int));
    875875      hPure(hstc, 0, &hNstc, hvar, hNvar, hpur0, &hNpure);
    876876      if (hNpure == hNvar)
     
    888888      break;
    889889  }
    890   hKill(stcmem, (currRing->N) - 1);
    891   omFreeSize((ADDRESS)hpur0, (1 + ((currRing->N) * (currRing->N))) * sizeof(int));
    892   omFreeSize((ADDRESS)hvar, ((currRing->N) + 1) * sizeof(int));
     890  hKill(stcmem, (r->N) - 1);
     891  omFreeSize((ADDRESS)hpur0, (1 + ((r->N) * (r->N))) * sizeof(int));
     892  omFreeSize((ADDRESS)hvar, ((r->N) + 1) * sizeof(int));
    893893  omFreeSize((ADDRESS)hwork, hNexist * sizeof(scmon));
    894894  hDelete(hexist, hNexist);
     
    897897}
    898898
    899 int  scMult0Int(ideal S, ideal Q)
     899int  scMult0Int(ideal S, ideal Q, const ring r)
    900900{
    901901  hDegree0(S, Q);
Note: See TracChangeset for help on using the changeset viewer.