Changeset 1eabfc in git

Timestamp:

Aug 26, 2018, 11:34:25 AM (5 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

46db0814d770d7de29357aac459e015a60f8df24

Parents:

53238ada2509c5e616157c153594cd6ff9f936be

Message:

fix: kTest_L  requires tailRing

Location:

kernel/GBEngine

Files:

• kspoly.cc (modified) (8 diffs)
• kstd2.cc (modified) (1 diff)
• kutil.cc (modified) (6 diffs)
• kutil.h (modified) (2 diffs)

kernel/GBEngine/kspoly.cc

@@ -59 +59 @@
   int ret = 0;
   ring tailRing = PR->tailRing;
-  kTest_L(PR);
+  kTest_L(PR,tailRing);
   kTest_T(PW);
 
@@ -192 +192 @@
   int ret = 0;
   ring tailRing = PR->tailRing;
-  kTest_L(PR);
+  kTest_L(PR,tailRing);
   kTest_T(PW);
 
@@ -336 +336 @@
   int ret = 0;
   ring tailRing = PR->tailRing;
-  kTest_L(PR);
+  kTest_L(PR,tailRing);
   kTest_T(PW);
 
@@ -473 +473 @@
   int ret = 0;
   ring tailRing = PR->tailRing;
-  kTest_L(PR);
+  kTest_L(PR,tailRing);
   kTest_T(PW);
 
@@ -671 +671 @@
   int ret = 0;
   ring tailRing = PR->tailRing;
-  kTest_L(PR);
+  kTest_L(PR,tailRing);
   kTest_T(PW);
 
@@ -909 +909 @@
   create_count++;
 #endif
-  kTest_L(Pair);
+  kTest_L(Pair,tailRing);
   poly p1 = Pair->p1;
   poly p2 = Pair->p2;
@@ -1027 +1027 @@
   poly Save =   PW->GetLmCurrRing();
 
-  kTest_L(PR);
+  kTest_L(PR,PR->tailRing);
   kTest_T(PW);
   pAssume(pIsMonomOf(Lp, Current));
@@ -1083 +1083 @@
   poly Save =   PW->GetLmCurrRing();
 
-  kTest_L(PR);
+  kTest_L(PR,PR->tailRing);
   kTest_T(PW);
   pAssume(pIsMonomOf(Lp, Current));

kernel/GBEngine/kstd2.cc

@@ -1439 +1439 @@
   //if (TEST_OPT_PROT) { PrintS("N"); mflush(); }
   //L->Normalize(); // HANNES: should have a test
-  kTest_L(L);
+  kTest_L(L,strat->tailRing);
   return L->GetLmCurrRing();
 }

kernel/GBEngine/kutil.cc

@@ -244 +244 @@
   if (strat->kHEdgeFound)
   {
-    kTest_L(L);
+    kTest_L(L,strat->tailRing);
     poly p1;
     poly p = L->GetLmTailRing();
@@ -311 +311 @@
         kBucketDestroy(&bucket);
     }
-    kTest_L(L);
+    kTest_L(L,strat->tailRing);
   }
 }
@@ -7541 +7541 @@
   //if (TEST_OPT_PROT) { PrintS("N"); mflush(); }
   //L->Normalize(); // HANNES: should have a test
-  kTest_L(L);
+  kTest_L(L,strat->tailRing);
   return L->GetLmCurrRing();
 }
@@ -7656 +7656 @@
   //if (TEST_OPT_PROT) { PrintS("N"); mflush(); }
   //L->Normalize(); // HANNES: should have a test
-  kTest_L(L);
+  kTest_L(L,strat->tailRing);
   return L->GetLmCurrRing();
 }
@@ -7771 +7771 @@
   //if (TEST_OPT_PROT) { PrintS("N"); mflush(); }
   //L->Normalize(); // HANNES: should have a test
-  kTest_L(L);
+  kTest_L(L,strat->tailRing);
   return L->GetLmCurrRing();
 }
@@ -12681 +12681 @@
   }
   L->Normalize(); // HANNES: should have a test
-  kTest_L(L);
+  kTest_L(L,strat->tailRing);
   return L->GetLmCurrRing();
 }

kernel/GBEngine/kutil.h

@@ -638 +638 @@
 BOOLEAN kTest_TS(kStrategy strat);
 // test LObject
-BOOLEAN kTest_L(LObject* L, ring tailRing = NULL,
+BOOLEAN kTest_L(LObject* L, ring tailRing,
                  BOOLEAN testp = FALSE, int lpos = -1,
                  TSet T = NULL, int tlength = -1);
@@ -650 +650 @@
 #define kTest_T(T)      (TRUE)
 #define kTest_S(T)      (TRUE)
-#define kTest_L(T)      (TRUE)
+#define kTest_L(T,R)    (TRUE)
 #endif