Changeset 9393180 in git

Timestamp:

Mar 20, 2017, 3:11:15 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8acf08c8c3f734aad67eab7e7b403203224fb8d0

Parents:

96be8798afa0d92a6a23c38e1626aaccec699d3b

Message:

rHasGlobalOrdering_currRing -> rHasGlobalOrdering(currRing)

Files:

• Singular/iparith.cc (modified) (2 diffs)
• Singular/ipshell.cc (modified) (1 diff)
• Singular/walk.cc (modified) (2 diffs)
• Singular/wrapper.cc (modified) (1 diff)
• kernel/GBEngine/syz.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

Singular/iparith.cc

@@ -4756 +4756 @@
     return TRUE;
   }
-  if (rHasLocalOrMixedOrdering_currRing())
+  if (rHasLocalOrMixedOrdering(currRing))
   {
     WerrorS("ordering must be global for slimgb");
@@ -6110 +6110 @@
     }
   }
-  if (((currRing->qideal!=NULL) && (rHasLocalOrMixedOrdering_currRing()))
+  if (((currRing->qideal!=NULL) && (rHasLocalOrMixedOrdering(currRing)))
   || ((rr->qideal!=NULL) && (rHasLocalOrMixedOrdering(rr))))
   {

Singular/ipshell.cc

@@ -1514 +1514 @@
   if(!idIsZeroDim(I)) return NULL; // not zero-dim.
   poly po=NULL;
-  if (rHasLocalOrMixedOrdering_currRing())
+  if (rHasLocalOrMixedOrdering(currRing))
   {
     scComputeHC(I,currRing->qideal,ak,po);

Singular/walk.cc

@@ -158 +158 @@
         //}
         strat->initEcart(&h);
-        if (rHasLocalOrMixedOrdering_currRing())
+        if (rHasLocalOrMixedOrdering(currRing))
         {
           deleteHC(&h,strat);
@@ -305 +305 @@
   strat->R           = initR();
   strat->sevT        = initsevT();
-  if(rHasLocalOrMixedOrdering_currRing())
+  if(rHasLocalOrMixedOrdering(currRing))
   {
     strat->honey = TRUE;

Singular/wrapper.cc

@@ -15 +15 @@
 static BOOLEAN jInitBasis(ideal v, jList **TT,jList **QQ)
 {
-  if (rHasLocalOrMixedOrdering_currRing())
+  if (rHasLocalOrMixedOrdering(currRing))
   {
     WerrorS("janet only for well-orderings");

kernel/GBEngine/syz.cc

@@ -128 +128 @@
     while ((j>0) && (syz->m[j-1]==NULL)) j--;
     existsUnit = FALSE;
-    if (rHasGlobalOrdering_currRing())
+    if (rHasGlobalOrdering(currRing))
     {
       while ((i<j) && (!existsUnit))

libpolys/polys/monomials/ring.h

@@ -755 +755 @@
 // #define rHasLocalOrMixedOrdering(R) ((R)->OrdSgn==-1)
 
-#define rHasGlobalOrdering_currRing() rHasGlobalOrdering(currRing)
-#define rHasLocalOrMixedOrdering_currRing() rHasLocalOrMixedOrdering(currRing)
-
 BOOLEAN rOrd_is_Totaldegree_Ordering(const ring r);