Changeset 0ec631 in git

Timestamp:

Jan 6, 2009, 4:49:15 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

de95ec6fb0ed8eeb4e8a94afd54d06b7f126e59a

Parents:

7f1e81f502d6c58582e3220a7509892397167bfe

Message:

*hannes: OrdSgn


git-svn-id: file:///usr/local/Singular/svn/trunk@11280 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/iparith.cc (modified) (3 diffs)
• Singular/ipshell.cc (modified) (2 diffs)
• Singular/walk.cc (modified) (5 diffs)
• Singular/wrapper.cc (modified) (1 diff)
• kernel/ideals.cc (modified) (2 diffs)
• kernel/kutil.cc (modified) (2 diffs)
• kernel/ring.h (modified) (2 diffs)
• kernel/sca.cc (modified) (2 diffs)
• kernel/syz.cc (modified) (2 diffs)
• kernel/syz0.cc (modified) (7 diffs)
• kernel/weight.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.484 2008-12-12 15:45:20 Singular Exp $ */
+/* $Id: iparith.cc,v 1.485 2009-01-06 15:48:28 Singular Exp $ */
 
 /*
@@ -4427 +4427 @@
     return TRUE;
   }
-  if (pOrdSgn!=1)
+  if (rHasLocalOrMixedOrdering_currRing)
   {
     WerrorS("ordering must be global for slimgb");
@@ -5715 +5715 @@
     }
   }
-  if (((currRing->qideal!=NULL) && (pOrdSgn==-1))
-  || ((rr->qideal!=NULL) && (rr->OrdSgn==-1)))
+  if (((currRing->qideal!=NULL) && (rHasLocalOrMixedOrdering_currRing))
+  || ((rr->qideal!=NULL) && (rHasLocalOrMixedOrdering(rr))))
   {
     WarnS("preimage in local qring may be wrong: use Ring::preimageLoc instead");

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.198 2009-01-06 14:00:57 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.199 2009-01-06 15:48:29 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -1409 +1409 @@
   if(!idIsZeroDim(I)) return NULL; // not zero-dim.
   poly po=NULL;
-  if (rHasLocalOrMixedOrdering(currRing))
+  if (rHasLocalOrMixedOrdering_currRing)
   {
     scComputeHC(I,currQuotient,ak,po);

Singular/walk.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: walk.cc,v 1.15 2008-09-19 14:15:14 Singular Exp $ */
+/* $Id: walk.cc,v 1.16 2009-01-06 15:48:29 Singular Exp $ */
 /*
 * ABSTRACT: Implementation of the Groebner walk
@@ -162 +162 @@
         //}
         strat->initEcart(&h);
-        if (pOrdSgn==-1)
+        if (rHasLocalOrMixedOrdering_currRing)
         {
           deleteHC(&h,strat);
@@ -190 +190 @@
       LObject h;
       h.p = pCopy(F->m[i]);
-      if (pOrdSgn==1)
+      if (rHasGlobalOrdering(currRing))
       {
         //h.p=redtailBba(h.p,strat->sl,strat);
         h.p=redtailBba(h.p,strat->sl,strat);
       }
-      strat->initEcart(&h);
-      if (pOrdSgn==-1)
+      else
       {
         deleteHC(&h,strat);
       }
+      strat->initEcart(&h);
       if (h.p!=NULL)
       {
@@ -233 +233 @@
       if(strat->sl>=0)
       {
-        if (pOrdSgn==1)
+        if (rHasGlobalOrdering(currRing))
         {
           h.p=redBba(h.p,strat->sl,strat);
@@ -304 +304 @@
   strat->R           = initR();
   strat->sevT        = initsevT();
-  if (pOrdSgn == -1)   strat->honey = TRUE;
+  if (rHasLocalOrMixedOrdering_currRing)   strat->honey = TRUE;
 
 

Singular/wrapper.cc

@@ -17 +17 @@
 BOOLEAN jInitBasis(ideal v, jList **TT,jList **QQ)
 {
-  if (pOrdSgn==-1)
+  if (rHasLocalOrMixedOrdering_currRing)
   {
     WerrorS("janet only for well-orderings");

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.63 2009-01-06 13:59:35 Singular Exp $ */
+/* $Id: ideals.cc,v 1.64 2009-01-06 15:49:14 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -687 +687 @@
 
   homog = idHomModule(h1,currQuotient,&wth);
-  if (rHasGlobalOrdering() && (!homog))
-  {
-    WarnS("minbase applies only to the local or homogeneous case");
-    e=idCopy(h1);
-    return e;
-  }
-  if ((currRing->OrdSgn == 1) && (homog))
-  {
-    ideal re=kMin_std(h1,currQuotient,(tHomog)homog,&wth,h2,NULL,0,3);
-    idDelete(&re);
-    return h2;
+  if (rHasGlobalOrdering_currRing)
+  {
+    if(!homog)
+    {
+      WarnS("minbase applies only to the local or homogeneous case");
+      e=idCopy(h1);
+      return e;
+    }
+    else
+    {
+      ideal re=kMin_std(h1,currQuotient,(tHomog)homog,&wth,h2,NULL,0,3);
+      idDelete(&re);
+      return h2;
+    }
   }
   e=idInit(1,h1->rank);

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.114 2008-12-08 10:00:44 wienand Exp $ */
+/* $Id: kutil.cc,v 1.115 2009-01-06 15:49:14 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -309 +309 @@
   poly h;
 
-  if(currRing->OrdSgn != -1) return;
+  if(rHasGlobalOrdering_currRing) return;
   if(TEST_OPT_CANCELUNIT) return;
 

kernel/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.34 2009-01-06 13:59:36 Singular Exp $ */
+/* $Id: ring.h,v 1.35 2009-01-06 15:49:14 Singular Exp $ */
 
 /* includes */
@@ -343 +343 @@
 BOOLEAN rHasSimpleLexOrder(const ring r);
 // return TRUE if p->exp[r->pOrdIndex] holds total degree of p */
-inline BOOLEAN rHasGlobalOrdering(const ring r=currRing)
-{ return (r->OrdSgn==1); }
-inline BOOLEAN rHasLocalOrMixedOrdering(const ring r=currRing)
-{ return (r->OrdSgn==-1); }
+//inline BOOLEAN rHasGlobalOrdering(const ring r=currRing)
+//{ return (r->OrdSgn==1); }
+#define rHasGlobalOrdering(R) ((R)->OrdSgn==1)
+#define rHasGlobalOrdering_currRing (pOrdSgn==1)
+//inline BOOLEAN rHasLocalOrMixedOrdering(const ring r=currRing)
+//{ return (r->OrdSgn==-1); }
+#define rHasLocalOrMixedOrdering(R) ((R)->OrdSgn==-1)
+#define rHasLocalOrMixedOrdering_currRing (pOrdSgn==-1)
 BOOLEAN rOrd_is_Totaldegree_Ordering(ring r =currRing);
 // return TRUE if p_SetComp requires p_Setm

kernel/sca.cc

@@ -7 +7 @@
  *  Author:  motsak (Oleksandr Motsak)
  *  Created: 2006/12/18
- *  Version: $Id: sca.cc,v 1.29 2008-09-16 12:32:33 Singular Exp $
+ *  Version: $Id: sca.cc,v 1.30 2009-01-06 15:49:14 Singular Exp $
  *******************************************************************/
 
@@ -2396 +2396 @@
 
 
-  if (rGR->OrdSgn==-1)
+  if (rHasLocalOrMixedOrdering(rGR))
   {
 #ifdef PDEBUG

kernel/syz.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz.cc,v 1.16 2008-09-16 12:32:33 Singular Exp $ */
+/* $Id: syz.cc,v 1.17 2009-01-06 15:49:15 Singular Exp $ */
 
 /*
@@ -140 +140 @@
     while ((j>0) && (syz->m[j-1]==NULL)) j--;
     existsUnit = FALSE;
-    if (currRing->OrdSgn == 1)
+    if (rHasGlobalOrdering_currRing)
     {
       while ((i<j) && (!existsUnit))

kernel/syz0.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz0.cc,v 1.6 2005-08-23 09:07:00 Singular Exp $ */
+/* $Id: syz0.cc,v 1.7 2009-01-06 15:49:15 Singular Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -891 +891 @@
       res=newres;
     }
-    if ((hom==isHomog)|| (origR->OrdSgn == 1))
+    if ((hom==isHomog)|| (rHasGlobalOrdering(origR)))
     {
       if (syzIndex==0) syInitSort(res[0],&modcomp);
@@ -904 +904 @@
     if ((syzIndex==0))
     {
-      if ((hom==isHomog)|| (origR->OrdSgn == 1))
+      if ((hom==isHomog)|| (rHasGlobalOrdering(origR)))
       {
         syRing = rCurrRingAssure_CompLastBlock();
@@ -929 +929 @@
       }
     }
-    if ((hom!=isHomog) && (origR->OrdSgn != 1))
+    if ((hom!=isHomog) && (rHasLocalOrMixedOrdering(origR)))
     {
       if (syzIndex==0) syInitSort(res[0],&modcomp);
@@ -939 +939 @@
   }
   //syPrintResolution(res,1,*length);
-  if ((hom!=isHomog) && (origR->OrdSgn != 1))
+  if ((hom!=isHomog) && (rHasLocalOrMixedOrdering(origR)))
   {
     syzIndex = 1;
@@ -948 +948 @@
     }
   }
-  if ((hom==isHomog) || (origR->OrdSgn == 1))
+  if ((hom==isHomog) || (rHasGlobalOrdering(origR)))
     syzIndex = 1;
   else
@@ -985 +985 @@
     }
   }
-  if ((hom==isHomog) || (origR->OrdSgn == 1))
+  if ((hom==isHomog) || (rHasGlobalOrdering(origR)))
   {
     if (res[1]!=NULL)

kernel/weight.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: weight.cc,v 1.7 2009-01-06 13:59:36 Singular Exp $ */
+/* $Id: weight.cc,v 1.8 2009-01-06 15:49:15 Singular Exp $ */
 
 /*
@@ -189 +189 @@
   *eweight = 0;
   n = pVariables;
-  if (rHasLocalOrMixedOrdering())
+  if (rHasLocalOrMixedOrdering_currRing)
     wFunctional = wFunctionalMora;
   else