Changeset 83552f in git

Timestamp:

Jan 28, 2000, 1:41:52 PM (24 years ago)

Author:

Thomas Siebert <siebert@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

526f34914e53401cb13d2d75c1f4cf26cbb4b7e8

Parents:

8786895d3dba9270ac0695c8bc822a76d248d43c

Message:

pComp0 removed


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

Location:

Singular

Files:

• ideals.cc (modified) (6 diffs)
• syz1.cc (modified) (5 diffs)
• syz2.cc (modified) (2 diffs)

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.86 2000-01-28 09:45:56 Singular Exp $ */
+/* $Id: ideals.cc,v 1.87 2000-01-28 12:37:28 siebert Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -386 +386 @@
 * for idSort: compare a and b revlex inclusive module comp.
 */
-static int pComp_RevLex(poly a, poly b)
-{
+static int pComp_RevLex(poly a, poly b,BOOLEAN nolex)
+{
+ if (nolex) return pComp0(a,b);
  int l=pVariables;
  while ((l>0) && (pGetExp(a,l)==pGetExp(b,l))) l--;
@@ -412 +413 @@
   BOOLEAN notFound;
 
-  pCompProc oldComp=pComp0;
-
-  if (!nolex) pComp0=pComp_RevLex;
-
   for (i=0;i<IDELEMS(id);i++)
   {
@@ -439 +436 @@
       while ((newpos>=0) && (newpos<actpos) && (notFound))
       {
-        newcomp = pComp0(id->m[i],id->m[(*result)[newpos]]);
+        newcomp = pComp_RevLex(id->m[i],id->m[(*result)[newpos]],nolex);
         olddiff = diff;
         if (diff>1)
@@ -486 +483 @@
       if (newpos<0) newpos = 0;
       if (newpos>actpos) newpos = actpos;
-      while ((newpos<actpos) && (pComp0(id->m[i],id->m[(*result)[newpos]])==0))
+      while ((newpos<actpos) && (pComp_RevLex(id->m[i],id->m[(*result)[newpos]],nolex)==0))
         newpos++;
       for (j=actpos;j>newpos;j--)
@@ -497 +494 @@
   }
   for (j=0;j<actpos;j++) (*result)[j]++;
-  pComp0=oldComp;
   return result;
 }

Singular/syz1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz1.cc,v 1.51 1999-11-25 13:12:27 siebert Exp $ */
+/* $Id: syz1.cc,v 1.52 2000-01-28 12:37:56 siebert Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -2540 +2540 @@
   SSet sPairs;
   int * ord,*b0,*b1;
-  pSetmProc oldSetm=pSetm;
-  pCompProc oldComp0=pComp0;
 
   assume(syzstr->syRing != NULL);
   rChangeCurrRing(syzstr->syRing, TRUE);
 //Print("laeufts ");
-  pComp0 = syzcomp2dpc;
   syzstr->bucket = kBucketCreate();
   for (index=syzstr->length-1;index>0;index--)
@@ -2598 +2595 @@
     // maybe incoporate it into syReorder ??
   }
-  else
-  {
-    pSetm=oldSetm;
-    pComp0=oldComp0;
-  }
   tres = syReorder(tres,syzstr->length,syzstr,FALSE,syzstr->res);
   syKillEmptyEntres(tres,syzstr->length);
@@ -2662 +2654 @@
     return syzstr;
   }
-  pSetmProc oldSetm=pSetm;
-  pCompProc oldComp0=pComp0;
 
   //crit = 0;
@@ -2683 +2673 @@
   }
   rChangeSComps(currcomponents, currShiftedComponents, arg->rank);
-  pComp0 = syzcomp2dpc;
 /*--- initializes the data structures---------------*/
   syzstr->Tl = NewIntvec1(*length);

Singular/syz2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz2.cc,v 1.11 1999-11-20 10:17:24 siebert Exp $ */
+/* $Id: syz2.cc,v 1.12 2000-01-28 12:41:52 siebert Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -940 +940 @@
   SSet nextPairs;
   ring origR = currRing;
-  pSetmProc oldSetm=pSetm;
-  pCompProc oldComp0=pComp0;
   syStrategy syzstr=(syStrategy)Alloc0SizeOf(ssyStrategy);