Changeset 5d9204 in git

Timestamp:

Oct 7, 2015, 4:36:18 PM (9 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c8523f8410f820a34a502d28335c7f785e0e8112

Parents:

8a14df4e24d2bd82a168c3ed70f92659b0bd2442

Message:

update

Location:

kernel/GBEngine

Files:

• kstd1.cc (modified) (3 diffs)
• kutil.cc (modified) (2 diffs)

kernel/GBEngine/kstd1.cc

@@ -1627 +1627 @@
     }
     #endif
-    //getchar();
+    getchar();
     #endif
     #ifdef KDEBUG
@@ -1701 +1701 @@
       printf("\nBefore Ll = %i\n", strat->Ll);
       #endif
-      int inittl = strat->tl;
-      red_result = strat->red(&strat->P,strat);
-      strat->tl = inittl;
+      #ifdef HAVE_RINGS
+      if(rField_is_Ring(strat->tailRing) && rHasLocalOrMixedOrdering(currRing))
+      {
+        int inittl = strat->tl;
+        red_result = strat->red(&strat->P,strat);
+        strat->tl = inittl;
+      }
+      else
+      #endif
+        red_result = strat->red(&strat->P,strat);
       #if ADIDEBUG
       printf("\nThis is P nach red:\n");p_Write(strat->P.p,strat->tailRing);p_Write(strat->P.p1,strat->tailRing);p_Write(strat->P.p2,strat->tailRing);
@@ -1735 +1742 @@
 
       // put in T
-      int inittl = strat->tl;
-      enterT(strat->P,strat);
-      strat->tl = inittl+1;
+      #ifdef HAVE_RINGS
+      if(rField_is_Ring(strat->tailRing) && rHasLocalOrMixedOrdering(currRing))
+      {
+        int inittl = strat->tl;
+        enterT(strat->P,strat);
+        strat->tl = inittl+1;
+      }
+      else
+        enterT(strat->P,strat);
+      #endif
       // build new pairs
 #ifdef HAVE_RINGS

kernel/GBEngine/kutil.cc

@@ -8036 +8036 @@
   strat->sevT[atT] = (p.sev == 0 ? pGetShortExpVector(p.p) : p.sev);
   #ifdef HAVE_RINGS
-  if(rField_is_Ring(currRing) && !n_IsUnit(p.p->coef, currRing->cf))
+  if(rField_is_Ring(currRing) && 
+  rHasLocalOrMixedOrdering(currRing) && !n_IsUnit(p.p->coef, currRing->cf))
   {
     #if ADIDEBUG_NF
@@ -9383 +9384 @@
     if(pNext(strat->S[i]) == NULL)
     {
-      pWrite(p);
-      pWrite(strat->S[i]);
+      //pWrite(p);
+      //pWrite(strat->S[i]);
       while(ok == FALSE)
       {