Changeset 1f637e in git for kernel/kstd1.cc

Timestamp:

Jul 19, 2011, 5:11:57 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1c4e9a5798bda4bc92d0013041b99005a50a7d7c

Parents:

6ed8c424bfe6fd9dc397bfdde3e8acf884469342

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-07-19 17:11:57+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:52:40+01:00

Message:

FIX: replaced pVariables by currRing->N...
ADD: added 'void rChangeCurrRing(ring r);' to polys/polys.h
CHG: started changing gr_kstd2.cc and syz*.cc

File:

• kernel/kstd1.cc (modified) (17 diffs)

kernel/kstd1.cc

@@ -642 +642 @@
 
 /*2
-*looks whether exactly pVariables-1 axis are used
+*looks whether exactly (currRing->N)-1 axis are used
 *returns last != 0 in this case
 *last is the (first) unused axis
@@ -657 +657 @@
     {
       i++;
-      if (i > pVariables) break;
+      if (i > (currRing->N)) break;
       if (strat->NotUsedAxis[i])
       {
@@ -942 +942 @@
       if (ecartWeights)
       {
-        omFreeSize((ADDRESS)ecartWeights,(pVariables+1)*sizeof(short));
+        omFreeSize((ADDRESS)ecartWeights,((currRing->N)+1)*sizeof(short));
         ecartWeights=NULL;
       }
@@ -1088 +1088 @@
     //else
     {
-      ecartWeights=(short *)omAlloc((pVariables+1)*sizeof(short));
+      ecartWeights=(short *)omAlloc(((currRing->N)+1)*sizeof(short));
       /*uses automatic computation of the ecartWeights to set them*/
       kEcartWeights(F->m,IDELEMS(F)-1,ecartWeights);
@@ -1095 +1095 @@
     if (TEST_OPT_PROT)
     {
-      for(i=1; i<=pVariables; i++)
+      for(i=1; i<=(currRing->N); i++)
         Print(" %d",ecartWeights[i]);
       PrintLn();
@@ -1108 +1108 @@
   idhdl h;
 
-  strat->NotUsedAxis = (BOOLEAN *)omAlloc((pVariables+1)*sizeof(BOOLEAN));
-  for (j=pVariables; j>0; j--) strat->NotUsedAxis[j] = TRUE;
+  strat->NotUsedAxis = (BOOLEAN *)omAlloc(((currRing->N)+1)*sizeof(BOOLEAN));
+  for (j=(currRing->N); j>0; j--) strat->NotUsedAxis[j] = TRUE;
   strat->enterS = enterSMora;
   strat->initEcartPair = initEcartPairMora; /*- ecart approximation -*/
@@ -1146 +1146 @@
     //else
     {
-      ecartWeights=(short *)omAlloc((pVariables+1)*sizeof(short));
+      ecartWeights=(short *)omAlloc(((currRing->N)+1)*sizeof(short));
       /*uses automatic computation of the ecartWeights to set them*/
       kEcartWeights(F->m,IDELEMS(F)-1,ecartWeights);
@@ -1154 +1154 @@
     if (TEST_OPT_PROT)
     {
-      for(i=1; i<=pVariables; i++)
+      for(i=1; i<=(currRing->N); i++)
         Print(" %d",ecartWeights[i]);
       PrintLn();
@@ -1400 +1400 @@
   strat->lastAxis = 0; //???
   pDelete(&strat->kNoether);
-  omFreeSize((ADDRESS)strat->NotUsedAxis,(pVariables+1)*sizeof(BOOLEAN));
+  omFreeSize((ADDRESS)strat->NotUsedAxis,((currRing->N)+1)*sizeof(BOOLEAN));
   if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
   if (TEST_OPT_WEIGHTM)
@@ -1407 +1407 @@
     if (ecartWeights)
     {
-      omFreeSize((ADDRESS)ecartWeights,(pVariables+1)*sizeof(short));
+      omFreeSize((ADDRESS)ecartWeights,((currRing->N)+1)*sizeof(short));
       ecartWeights=NULL;
     }
@@ -1517 +1517 @@
   omFreeSize((ADDRESS)strat->ecartS,IDELEMS(strat->Shdl)*sizeof(int));
   omFreeSize((ADDRESS)strat->sevS,IDELEMS(strat->Shdl)*sizeof(unsigned long));
-  omFreeSize((ADDRESS)strat->NotUsedAxis,(pVariables+1)*sizeof(BOOLEAN));
+  omFreeSize((ADDRESS)strat->NotUsedAxis,((currRing->N)+1)*sizeof(BOOLEAN));
   omfree(strat->sevT);
   omfree(strat->S_2_R);
@@ -1535 +1535 @@
     if (ecartWeights)
     {
-      omFreeSize((ADDRESS *)&ecartWeights,(pVariables+1)*sizeof(short));
+      omFreeSize((ADDRESS *)&ecartWeights,((currRing->N)+1)*sizeof(short));
       ecartWeights=NULL;
     }
@@ -1656 +1656 @@
   omFreeSize((ADDRESS)strat->ecartS,IDELEMS(strat->Shdl)*sizeof(int));
   omFreeSize((ADDRESS)strat->sevS,IDELEMS(strat->Shdl)*sizeof(unsigned long));
-  omFreeSize((ADDRESS)strat->NotUsedAxis,(pVariables+1)*sizeof(BOOLEAN));
+  omFreeSize((ADDRESS)strat->NotUsedAxis,((currRing->N)+1)*sizeof(BOOLEAN));
   omfree(strat->sevT);
   omfree(strat->S_2_R);
@@ -1674 +1674 @@
     if (ecartWeights)
     {
-      omFreeSize((ADDRESS *)&ecartWeights,(pVariables+1)*sizeof(short));
+      omFreeSize((ADDRESS *)&ecartWeights,((currRing->N)+1)*sizeof(short));
       ecartWeights=NULL;
     }
@@ -2205 +2205 @@
   strat->ak = idRankFreeModule(tempF);
   initBuchMoraCrit(strat);
-  strat->NotUsedAxis = (BOOLEAN *)omAlloc((pVariables+1)*sizeof(BOOLEAN));
-  for (j=pVariables; j>0; j--) strat->NotUsedAxis[j] = TRUE;
+  strat->NotUsedAxis = (BOOLEAN *)omAlloc(((currRing->N)+1)*sizeof(BOOLEAN));
+  for (j=(currRing->N); j>0; j--) strat->NotUsedAxis[j] = TRUE;
   strat->enterS      = enterSBba;
   strat->posInT      = posInT17;
@@ -2228 +2228 @@
   omFreeSize((ADDRESS)strat->ecartS,IDELEMS(strat->Shdl)*sizeof(int));
   omFreeSize((ADDRESS)strat->sevS,IDELEMS(strat->Shdl)*sizeof(unsigned long));
-  omFreeSize((ADDRESS)strat->NotUsedAxis,(pVariables+1)*sizeof(BOOLEAN));
+  omFreeSize((ADDRESS)strat->NotUsedAxis,((currRing->N)+1)*sizeof(BOOLEAN));
   omfree(strat->sevT);
   omfree(strat->S_2_R);
@@ -2507 +2507 @@
     if (ecartWeights)
     {
-      omFreeSize((ADDRESS)ecartWeights,(pVariables+1)*sizeof(short));
+      omFreeSize((ADDRESS)ecartWeights,((currRing->N)+1)*sizeof(short));
       ecartWeights=NULL;
     }