Changeset 009bd5 in git for kernel/GBEngine/kstd1.cc

Timestamp:

Dec 4, 2014, 11:23:02 AM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'df6a8e29030ff93c6ad53051028727af7d339fa0')

Children:

d50995160fd4a66b8b49207ac2c86fa22afea1ee

Parents:

d5771f0b547225409cbbd4793cbfe2cb394b5416

Message:

kstd1/kutil: clean r->OrdSgn: rHasGlobalOrdering

File:

• kernel/GBEngine/kstd1.cc (modified) (11 diffs)

kernel/GBEngine/kstd1.cc

@@ -1187 +1187 @@
     strat->use_buckets = kMoraUseBucket(strat);
 #else
-  if ( (!rField_is_Ring(currRing)) || (currRing->OrdSgn != -1))
-    {
-    strat->red = redFirst;
+    if ( (!rField_is_Ring(currRing)) || (rHasGlobalOrdering(currRing)))
+    {
+      strat->red = redFirst;
       strat->use_buckets = kMoraUseBucket(strat);
-      }
-#endif
-
+    }
+#endif
     updateT(strat);
 
@@ -1200 +1199 @@
     reorderT(strat);
 #else
-  if ( (!rField_is_Ring(currRing)) || (currRing->OrdSgn != -1))
-    {
-    strat->posInT = posInT2;
+    if ( (!rField_is_Ring(currRing)) || (rHasGlobalOrdering(currRing)))
+    {
+      strat->posInT = posInT2;
       reorderT(strat);
-      }
+    }
 #endif
   }
@@ -1363 +1362 @@
   if (rField_is_Ring(currRing))
   {
-    if(currRing->OrdSgn == -1)
+    if(rHasLocalOrMixedOrdering(currRing))
       {strat->red = redRiloc;}
     else
@@ -2178 +2177 @@
 #ifdef HAVE_RINGS
   if (rField_is_Ring(currRing))
-    {
-    if(currRing->OrdSgn == -1)
+  {
+    if(rHasLocalOrMixedOrdering(currRing))
       r=mora(F,Q,NULL,hilb,strat);
     else
       r=bba(F,Q,NULL,hilb,strat);
-    }
+  }
   else
 #endif
   {
-    if (currRing->OrdSgn==-1)
+    if (rHasLocalOrMixedOrdering(currRing))
     {
       if (w!=NULL)
@@ -2329 +2328 @@
 #endif
   {
-    if (currRing->OrdSgn==-1)
+    if (rHasLocalOrMixedOrdering(currRing))
     {
       if (w!=NULL)
@@ -2426 +2425 @@
   idTest(F);
 #endif
-  if (currRing->OrdSgn==-1)
+  if (rHasLocalOrMixedOrdering(currRing))
   {
     /* error: no local ord yet with shifts */
@@ -2552 +2551 @@
   }
   strat->homog=h;
-  if (currRing->OrdSgn==-1)
+  if (rHasLocalOrMixedOrdering(currRing))
   {
     if (w!=NULL)
@@ -2647 +2646 @@
   poly res;
 
-  if (currRing->OrdSgn==-1)
+  if (rHasLocalOrMixedOrdering(currRing))
     res=kNF1(F,Q,pp,strat,lazyReduce);
   else
@@ -2700 +2699 @@
   }
 
-  if (currRing->OrdSgn==-1)
+  if (rHasLocalOrMixedOrdering(currRing))
     res=kNF1(F,Q,pp,strat,lazyReduce);
   else
@@ -2770 +2769 @@
   strat->R           = initR();
   strat->sevT        = initsevT();
-  if (currRing->OrdSgn == -1)   strat->honey = TRUE;
+  if (rHasLocalOrMixedOrdering(currRing))   strat->honey = TRUE;
   initS(tempF, tempQ, strat);
   if (TEST_OPT_REDSB)
@@ -3080 +3079 @@
   if(rIsPluralRing(currRing)) return kInterRedOld(F,Q);
 #endif
-  if ((currRing->OrdSgn==-1)|| (rField_is_numeric(currRing))
+  if ((rHasLocalOrMixedOrdering(currRing))|| (rField_is_numeric(currRing))
   #ifdef HAVE_RINGS
   ||(rField_is_Ring(currRing))