Changeset fe89b98 in git

Timestamp:

Aug 21, 2011, 3:28:09 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

2e757c48501ca724ccafe96fc2ffb048a4ca59de

Parents:

4691363437c8cb2f8bd9e698274bb467a91b9feb

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-21 15:28:09+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:24+01:00

Message:

fix pLeXOrder

Files:

• Singular/iparith.cc (modified) (2 diffs)
• kernel/gr_kstd2.cc (modified) (4 diffs)
• kernel/kstd1.cc (modified) (15 diffs)
• kernel/kstd2.cc (modified) (2 diffs)
• kernel/kstdfac.cc (modified) (3 diffs)
• kernel/kutil.cc (modified) (2 diffs)
• kernel/tgb.cc (modified) (1 diff)
• libpolys/polys/polys.h (modified) (1 diff)

Singular/iparith.cc

@@ -2305 +2305 @@
   }
   pFDegProc deg;
-  if (pLexOrder && (currRing->order[0]==ringorder_lp))
+  if (currRing->pLexOrder && (currRing->order[0]==ringorder_lp))
     deg=p_Totaldegree;
    else
@@ -2325 +2325 @@
   pFDegProc save_FDeg=currRing->pFDeg;
   pLDegProc save_LDeg=currRing->pLDeg;
-  BOOLEAN save_pLexOrder=pLexOrder;
-  pLexOrder=FALSE;
+  BOOLEAN save_pLexOrder=currRing->pLexOrder;
+  currRing->pLexOrder=FALSE;
   kHomW=vw;
   kModW=w;
   pSetDegProcs(currRing,kHomModDeg);
   res->data=(void *)(long)idHomModule(v_id,currQuotient,&w);
-  pLexOrder=save_pLexOrder;
+  currRing->pLexOrder=save_pLexOrder;
   kHomW=NULL;
   kModW=NULL;

kernel/gr_kstd2.cc

@@ -906 +906 @@
         return 0;
       }
-      if (strat->honey && pLexOrder)
+      if (strat->honey && currRing->pLexOrder)
         strat->initEcart(h);
       /* h.length:=l; */
@@ -922 +922 @@
 //        }
 //      }
-      if (strat->honey || pLexOrder)
+      if (strat->honey || currRing->pLexOrder)
       {
         pass++;
@@ -979 +979 @@
   else if (strat->honey)
     strat->red = nc_redHoney;
-  else if (pLexOrder && !strat->homog)
+  else if (currRing->pLexOrder && !strat->homog)
     strat->red = nc_redLazy;
   else if (TEST_OPT_INTSTRATEGY && strat->homog)
@@ -1007 +1007 @@
 #endif
 
-  if (pLexOrder && strat->honey)
+  if (currRing->pLexOrder && strat->honey)
     strat->initEcart = initEcartNormal;
   else

kernel/kstd1.cc

@@ -1055 +1055 @@
   if (strat->honey)
     strat->red = redHoney;
-  else if (pLexOrder && !strat->homog)
+  else if (currRing->pLexOrder && !strat->homog)
     strat->red = redLazy;
   else
@@ -1068 +1068 @@
   }
 #endif
-  if (pLexOrder && strat->honey)
+  if (currRing->pLexOrder && strat->honey)
     strat->initEcart = initEcartNormal;
   else
@@ -1717 +1717 @@
 
   ideal r;
-  BOOLEAN b=pLexOrder,toReset=FALSE;
+  BOOLEAN b=currRing->pLexOrder,toReset=FALSE;
   BOOLEAN delete_w=(w==NULL);
   kStrategy strat=new skStrategy;
@@ -1737 +1737 @@
   if (vw != NULL)
   {
-    pLexOrder=FALSE;
+    currRing->pLexOrder=FALSE;
     strat->kHomW=kHomW=vw;
     pFDegOld = currRing->pFDeg;
@@ -1756 +1756 @@
     }
   }
-  pLexOrder=b;
+  currRing->pLexOrder=b;
   if (h==isHomog)
   {
@@ -1770 +1770 @@
       }
     }
-    pLexOrder = TRUE;
+    currRing->pLexOrder = TRUE;
     if (hilb==NULL) strat->LazyPass*=2;
   }
@@ -1828 +1828 @@
     pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
   }
-  pLexOrder = b;
+  currRing->pLexOrder = b;
 //Print("%d reductions canceled \n",strat->cel);
   HCord=strat->HCord;
@@ -1841 +1841 @@
 {
   ideal r;
-  BOOLEAN b=pLexOrder,toReset=FALSE;
+  BOOLEAN b=currRing->pLexOrder,toReset=FALSE;
   BOOLEAN delete_w=(w==NULL);
   kStrategy strat=new skStrategy;
@@ -1859 +1859 @@
   if (vw != NULL)
   {
-    pLexOrder=FALSE;
+    currRing->pLexOrder=FALSE;
     strat->kHomW=kHomW=vw;
     pFDegOld = currRing->pFDeg;
@@ -1878 +1878 @@
     }
   }
-  pLexOrder=b;
+  currRing->pLexOrder=b;
   if (h==isHomog)
   {
@@ -1892 +1892 @@
       }
     }
-    pLexOrder = TRUE;
+    currRing->pLexOrder = TRUE;
     if (hilb==NULL) strat->LazyPass*=2;
   }
@@ -1921 +1921 @@
     pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
   }
-  pLexOrder = b;
+  currRing->pLexOrder = b;
 //Print("%d reductions canceled \n",strat->cel);
   HCord=strat->HCord;
@@ -1948 +1948 @@
   int Kstd1_OldDeg = Kstd1_deg,i;
   intvec* temp_w=NULL;
-  BOOLEAN b=pLexOrder,toReset=FALSE;
+  BOOLEAN b=currRing->pLexOrder,toReset=FALSE;
   BOOLEAN delete_w=(w==NULL);
   BOOLEAN oldDegBound=TEST_OPT_DEGBOUND;
@@ -2003 +2003 @@
       }
     }
-    pLexOrder = TRUE;
+    currRing->pLexOrder = TRUE;
     strat->LazyPass*=2;
   }
@@ -2033 +2033 @@
     kModW = NULL;
   }
-  pLexOrder = b;
+  currRing->pLexOrder = b;
   HCord=strat->HCord;
   if ((delete_w)&&(temp_w!=NULL)) delete temp_w;

kernel/kstd2.cc

@@ -118 +118 @@
 #if 1
   int ende;
-  if ((strat->ak>0) || pLexOrder) ende=strat->sl;
+  if ((strat->ak>0) || currRing->pLexOrder) ende=strat->sl;
   else ende=posInS(strat,*max_ind,p,0)+1;
   if (ende>(*max_ind)) ende=(*max_ind);
@@ -1975 +1975 @@
   strat->red = redFirstShift; /* no redHomog ! */
 
-  if (pLexOrder && strat->honey)
+  if (currRing->pLexOrder && strat->honey)
     strat->initEcart = initEcartNormal;
   else

kernel/kstdfac.cc

@@ -898 +898 @@
 #ifdef HAVE_FACTORY
   ideal r;
-  BOOLEAN b=pLexOrder,toReset=FALSE;
+  BOOLEAN b=currRing->pLexOrder,toReset=FALSE;
   BOOLEAN delete_w=(w==NULL);
   kStrategy strat=new skStrategy;
@@ -931 +931 @@
       toReset = TRUE;
     }
-    pLexOrder = TRUE;
+    currRing->pLexOrder = TRUE;
     strat->LazyPass*=2;
   }
@@ -1032 +1032 @@
     kModW = NULL;
   }
-  pLexOrder = b;
+  currRing->pLexOrder = b;
   delete(strat);
   strat=orgstrat;

kernel/kutil.cc

@@ -391 +391 @@
 
   strat->kHEdgeFound=FALSE;
-  if (pLexOrder || currRing->MixedOrder)
+  if (currRing->pLexOrder || currRing->MixedOrder)
   {
     return;
@@ -5835 +5835 @@
         strat->posInT = posInT_EcartpLength;
     }
-    else if (pLexOrder && !TEST_OPT_INTSTRATEGY)
+    else if (currRing->pLexOrder && !TEST_OPT_INTSTRATEGY)
     {
       strat->posInL = posInL11;

kernel/tgb.cc

@@ -3222 +3222 @@
     }
   }
-  eliminationProblem = ((!(is_homog)) && ((pLexOrder) || (I->rank > 1)));
+  eliminationProblem = ((!(is_homog)) && ((currRing->pLexOrder) || (I->rank > 1)));
   tailReductions = ((is_homog) || ((TEST_OPT_REDTAIL) && (!(I->rank > 1))));
   //  Print("is homog:%d",c->is_homog);

libpolys/polys/polys.h

@@ -225 +225 @@
 typedef poly*   polyset;
 extern int      pOrdSgn;
-extern BOOLEAN  pLexOrder;
 extern poly     ppNoether;
 extern BOOLEAN  pVectorOut;