Changeset 1c94e4 in git for kernel

Timestamp:

Feb 25, 2013, 7:43:37 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1ebec3c7efad1d47983c6cf8615fcf49efdc661a

Parents:

9d68fdf479afa832b1ae8fbea4d7345ac1b18fbd

Message:

Fixing firstUpdate (un-commented code)

Location:

kernel

Files:

• kstd1.cc (modified) (1 diff)
• kutil.cc (modified) (1 diff)

kernel/kstd1.cc

@@ -925 +925 @@
     assume(kTest_TS(strat));
     strat->update = (strat->tl == -1);
-    //if (TEST_OPT_WEIGHTM)
-    //{
-    //  pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
-    //  if (strat->tailRing != currRing)
-    //  {
-    //    strat->tailRing->pFDeg = strat->pOrigFDeg_TailRing;
-    //    strat->tailRing->pLDeg = strat->pOrigLDeg_TailRing;
-    //  }
-    //  int i;
-    //  for (i=strat->Ll; i>=0; i--)
-    //  {
-    //    strat->L[i].SetpFDeg();
-    //  }
-    //  for (i=strat->tl; i>=0; i--)
-    //  {
-    //    strat->T[i].SetpFDeg();
-    //  }
-    //  if (ecartWeights)
-    //  {
-    //    omFreeSize((ADDRESS)ecartWeights,((currRing->N)+1)*sizeof(short));
-    //    ecartWeights=NULL;
-    //  }
-    //}
+    if (TEST_OPT_WEIGHTM)
+    {
+      pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
+      if (strat->tailRing != currRing)
+      {
+        strat->tailRing->pFDeg = strat->pOrigFDeg_TailRing;
+        strat->tailRing->pLDeg = strat->pOrigLDeg_TailRing;
+      }
+      int i;
+      for (i=strat->Ll; i>=0; i--)
+      {
+        strat->L[i].SetpFDeg();
+      }
+      for (i=strat->tl; i>=0; i--)
+      {
+        strat->T[i].SetpFDeg();
+      }
+      if (ecartWeights)
+      {
+        omFreeSize((ADDRESS)ecartWeights,(rVar(currRing)+1)*sizeof(short));
+        ecartWeights=NULL;
+      }
+    }
     if (TEST_OPT_FASTHC)
     {

kernel/kutil.cc

@@ -8553 +8553 @@
     if(TEST_OPT_DEGBOUND)
       Print(" degBound: %d\n", Kstd1_deg);
-    #ifndef NDEBUG
+   
+    if( ecartWeights != NULL )
+    { 
+       PrintS("ecartWeights: "); 
+       for (int i = rVar(currRing); i > 0; i--)
+         Print("%hd ", ecartWeights[i]);
+       PrintLn();
+       assume( TEST_OPT_WEIGHTM );
+    }
+     
+#ifndef NDEBUG
     rDebugPrint(currRing);
-    #endif
+#endif
 }