Changeset c5dc3d in git

Timestamp:

Nov 18, 1999, 7:43:58 PM (24 years ago)

Author:

Thomas Siebert <siebert@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

b47732ef9f553140e8a89c34abf89d850c8cf74f

Parents:

66502b8276a2e9122fc865791501fa86a14f2749

Message:

Bugfixes in syzygies


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

Location:

Singular

Files:

• syz.cc (modified) (5 diffs)
• syz0.cc (modified) (6 diffs)
• syz2.cc (modified) (13 diffs)

Singular/syz.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz.cc,v 1.29 1999-11-16 12:39:31 obachman Exp $ */
+/* $Id: syz.cc,v 1.30 1999-11-18 18:43:57 siebert Exp $ */
 
 /*
@@ -408 +408 @@
   BOOLEAN completeMinim;
   BOOLEAN oldDegBound=TEST_OPT_DEGBOUND;
+  BOOLEAN setRegularity=TRUE;
   int wlength=*length;
 
@@ -458 +459 @@
     if (w!=NULL) { delete w;w=NULL; }
     w = w1;
+    j = 0;
+    while ((j<IDELEMS(res[0])) && (res[0]->m[j]==NULL)) j++;
+    if (j<IDELEMS(res[0]))
+    {
+      if (pFDeg(res[0]->m[j])!=pTotaldegree(res[0]->m[j]))
+        setRegularity = FALSE;
+    }
+  }
+  else
+  {
+    setRegularity = FALSE;
   }
     
@@ -484 +496 @@
     }
 /*--- interreducing first -----------------------------------*/
+    if (syzIndex>0)
+    {
+      int rkI=idRankFreeModule(res[syzIndex]);
+      rSetSyzComp(rkI);
+    }
     if (minim || (syzIndex!=0))
     {
-      if (syzIndex>0)
-      {
-        int rkI=idRankFreeModule(res[syzIndex]);
-        rSetSyzComp(rkI);
-      }
       temp = kInterRed(res[syzIndex],currQuotient);
       idDelete(&res[syzIndex]);
@@ -500 +512 @@
     if ((currQuotient==NULL)&&(syzIndex==0)&& (!TEST_OPT_DEGBOUND))
     {
-      res[/*syzIndex+*/1] = idSyzygies(res[0/*syzIndex*/],hom,&w,FALSE,TRUE,&Kstd1_deg);
+      res[/*syzIndex+*/1] = idSyzygies(res[0/*syzIndex*/],hom,&w,FALSE,setRegularity,&Kstd1_deg);
       if ((!TEST_OPT_NOTREGULARITY) && (Kstd1_deg>0)) test |= Sy_bit(OPT_DEGBOUND);
     }

Singular/syz0.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz0.cc,v 1.25 1999-11-15 17:20:53 obachman Exp $ */
+/* $Id: syz0.cc,v 1.26 1999-11-18 18:43:57 siebert Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -185 +185 @@
 
 /*-------------initializing the sets--------------------*/
-  ideal idF=(ideal)AllocSizeOf(ip_sideal);
+  ideal idF=(ideal)Alloc0SizeOf(ip_sideal);
   ST=(polyset)Alloc0(Fl*sizeof(poly));
   S=(polyset)Alloc0(Fl*sizeof(poly));
@@ -198 +198 @@
   tmax = 2*Fl;
   idF->m=F;IDELEMS(idF)=Fmax;
+  idF->nrows=1;
   rkF=idRankFreeModule(idF);
-  FreeSizeOf((ADDRESS)idF,ip_sideal);
 /*-------------sorting of F for index handling------------*/
   if (noSort)
@@ -206 +206 @@
     F=syInitSort(F,rkF,Fmax,1,&modcomp);
   }
+#ifndef __OPTIMIZE__
+Print("Neue Anordnung: ");
+idF->m=F;IDELEMS(idF)=Fmax;
+idF->nrows=1;
+idPrint(idF);
+FreeSizeOf((ADDRESS)idF,ip_sideal);
+#endif
 /*----------------construction of the new ordering----------*/
   pSetSchreyerOrdM(F,Fl,rkF);
@@ -910 +917 @@
         if ((currRing->OrdSgn != 1) && (hom!=isHomog))
         {
-          for (i=0; i<IDELEMS(res[1]); i++)
-          {
-            res[1]->m[i] = prMoveR( res[1]->m[i], origR);
+          for (i=0; i<IDELEMS(res[0]); i++)
+          {
+            res[0]->m[i] = prMoveR( res[0]->m[i], origR);
           }
         }
@@ -922 +929 @@
           }
         }
-        idTest(res[1]);
+        idTest(res[0]);
       }
     }

Singular/syz2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz2.cc,v 1.8 1999-11-15 17:20:54 obachman Exp $ */
+/* $Id: syz2.cc,v 1.9 1999-11-18 18:43:58 siebert Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -46 +46 @@
 #define USE_HEURISTIC2
 
-extern void rSetmS(poly p, int* Components, long* ShiftedComponents);
 #ifdef SHOW_CRIT
 static int crit;
@@ -127 +126 @@
             p = pOne();
             pLcm((syzstr->resPairs[index])[i].p,toHandle,p);
-            rSetmS(p,Components, ShiftedComponents);
+            pSetm(p);
             j = 0;
             while (j<i)
@@ -232 +231 @@
           tso.p = NULL;
           tso.length = -1;
-          currcomponents = syzstr->truecomponents[index];
-          currShiftedComponents = syzstr->ShiftedComponents[index];
-          rChangeSComps(currcomponents,
-                        currShiftedComponents,
-                        IDELEMS(syzstr->res[index])); // actueller index
           number coefgcd =
             nGcd(pGetCoeff(tso.p1),pGetCoeff(tso.p2));
@@ -252 +246 @@
           tso.syz = pAdd(pp,tso.syz);
           nDelete(&coefgcd);
-          currcomponents = syzstr->truecomponents[index-1];
-          currShiftedComponents = syzstr->ShiftedComponents[index-1];
           pSetComp(tso.lcm,pGetComp((syzstr->resPairs[index])[r1].syz));
-          rChangeSComps(currcomponents,
-                        currShiftedComponents,
-                        IDELEMS(syzstr->res[index])); // actueller index
 #ifdef SHOW_PROT
 Print("erzeuge Paar im Modul %d,%d mit: \n",index,tso.order);
@@ -292 +281 @@
 * set the vectors of truecomponents
 */
-static BOOLEAN syOrder_Hilb(poly p,syStrategy syzstr,int index,
-                    int realcomp)
-{
-  int i=IDELEMS(syzstr->res[index-1])+1,j=0,k,tc,orc,ie;
-  int *trind1=syzstr->truecomponents[index-1];
-  int *trind=syzstr->truecomponents[index];
-  long *shind=syzstr->ShiftedComponents[index];
-  poly pp;
-  polyset o_r=syzstr->orderedRes[index]->m;
-  BOOLEAN ret = FALSE;
-
-  // if != 0, then new element can go into same component
-  // i.e., we do not need to leave space in shifted components
-  long same_comp = 0;
-
-  if (p==NULL) return FALSE;
-  if (realcomp==0) realcomp=1;
-  ie = IDELEMS(syzstr->orderedRes[index]);
-  while ((ie>0) && (syzstr->orderedRes[index]->m[ie-1]==NULL)) ie--;
-  if (ie==0)
-  {
-    j = 0;
-  }
-  else
-  {
-    if (index>1)
-      tc = trind1[pGetComp(p)];
-    else
-      tc = pGetComp(p);
-    loop
-    {
-      orc = pGetComp(o_r[j]);
-      if (trind1[orc]>tc+1) break;
-      else if (trind1[orc] == tc+1)
-      {
-        same_comp = 1;
-      }
-      j++;
-      if (j==ie) break;
-    } 
-  }
-  if (j == ie)
-  {
-    // new element is the last in ordered module
-    if (same_comp == 0)
-      same_comp = SYZ_SHIFT_BASE;
-
-    // test wheter we have enough space for new shifted component
-    if ((LONG_MAX - same_comp) <= shind[ie])
-    {
-      long new_space = syReorderShiftedComponents(shind, ie+1);
-      assume((LONG_MAX - same_comp) > shind[ie]);
-      ret = TRUE;
-      if (TEST_OPT_PROT) Print("(T%u)", new_space);
-    }
-
-    // yes, then set new shifted component
-    assume(ie == 0 || shind[ie] > 0);
-    shind[ie+1] = shind[ie] + same_comp;
-  }
-  else
-  {
-    // new element must come in between
-    // i.e. at place j+1
-    long prev, next;
-
-    // test whether new component can get shifted value
-    prev = shind[j];
-    next = shind[j+1];
-    assume(next > prev);
-    if ((same_comp && prev + 2 >= next) || (!same_comp && next - prev < 4))
-    {
-       long new_space = syReorderShiftedComponents(shind, ie+1);
-      prev = shind[j];
-      next = shind[j+1];
-      assume((same_comp && prev + 2 < next) || (!same_comp && next - prev >= 4));
-      ret = TRUE;
-     if (TEST_OPT_PROT) Print("(B%u)", new_space);
-    }
-
-    // make room for insertion of j+1 shifted component
-    for (k=ie+1; k > j+1; k--) shind[k] = shind[k-1];
-
-    if (same_comp)
-    {
-      // can simply add one
-      shind[j+1] = prev + 1;
-      assume(shind[j+1] + 1 < shind[j+2]);
-    }
-    else
-    {
-      // need to leave more breathing room - i.e. value goes in
-      // between
-      shind[j+1]  = prev + ((next - prev) >> 1);
-      assume (shind[j] + 1 < shind[j+1] && shind[j+1] + 1 < shind[j+2]);
-    }
-  }
-
-  if (o_r[j]!=NULL)
-  {
-    for (k=ie;k>j;k--)
-    {
-      o_r[k] = o_r[k-1];
-    }
-  }
-  o_r[j] = p;
-  for (k=0;k<IDELEMS((syzstr->res)[index]);k++)
-  {
-    if (trind[k]>j)
-      trind[k] += 1;
-  }
-  for (k=IDELEMS((syzstr->res)[index])-1;k>realcomp;k--)
-    trind[k] = trind[k-1];
-  trind[realcomp] = j+1;
-  return ret;
+static void syOrder_Hilb(poly p,syStrategy syzstr,int index)
+{
+  int i=IDELEMS(syzstr->orderedRes[index]);
+
+  while ((i>0) && (syzstr->orderedRes[index]->m[i-1]==NULL)) i--;
+  syzstr->orderedRes[index]->m[i] = p;
 }
 
@@ -435 +315 @@
   tso.syz = pHead(syz);
   pSetComp(tso.syz,newEl+1);
+  pSetm(tso.syz);
   tso.lcm = pHead(tso.syz);
   tso.length = pLength(syz);
-  if (syOrder_Hilb(syz,syzstr,index,newEl+1))
-    syResetShiftedComponents(syzstr, index+1,1);
-  rSetmS(tso.syz,syzstr->truecomponents[index],syzstr->ShiftedComponents[index]);
+  syOrder_Hilb(syz,syzstr,index);
 #ifdef SHOW_PROT
 Print("erzeuge Halbpaar im Module %d,%d mit: \n",index,tso.order);
@@ -742 +621 @@
 Print("syz: ");pWrite(redset[j].syz);
 #endif
-            currcomponents = syzstr->truecomponents[index];
-            currShiftedComponents = syzstr->ShiftedComponents[index];
-            rChangeSComps(currcomponents,
-                          currShiftedComponents,
-                          IDELEMS(syzstr->res[index]));
             sySPRedSyz(syzstr,redset[j],q);
-            currcomponents = syzstr->truecomponents[index-1];
-            currShiftedComponents = syzstr->ShiftedComponents[index-1];
-            rChangeSComps(currcomponents,
-                          currShiftedComponents,
-                          IDELEMS(syzstr->res[index-1]));
             number up = kBucketPolyRed(syzstr->bucket,redset[j].p,
                          redset[j].length, NULL);
@@ -771 +640 @@
         }
         kBucketClear(syzstr->bucket,&tso.p,&tso.length);
-        currcomponents = syzstr->truecomponents[index];
-        currShiftedComponents = syzstr->ShiftedComponents[index];
-        rChangeSComps(currcomponents,
-                      currShiftedComponents,
-                      IDELEMS(syzstr->res[index]));
         int il;
         kBucketClear(syzstr->syz_bucket,&tso.syz,&il);
-        currcomponents = syzstr->truecomponents[index-1];
-        currShiftedComponents = syzstr->ShiftedComponents[index-1];
-        rChangeSComps(currcomponents,
-                      currShiftedComponents,
-                      IDELEMS(syzstr->res[index-1]));
       }
 #ifdef SHOW_PROT
@@ -816 +675 @@
         if (ks==IDELEMS(syzstr->res[index+1]))
           syEnlargeFields(syzstr,index+1);
-        currcomponents = syzstr->truecomponents[index];
-        currShiftedComponents = syzstr->ShiftedComponents[index];
-            rChangeSComps(currcomponents,
-                          currShiftedComponents,
-                          IDELEMS(syzstr->res[index]));
         syzstr->res[index+1]->m[ks] = syRed_Hilb(tso.syz,syzstr,index+1);
-        currcomponents = syzstr->truecomponents[index-1];
-        currShiftedComponents = syzstr->ShiftedComponents[index-1];
-            rChangeSComps(currcomponents,
-                          currShiftedComponents,
-                          IDELEMS(syzstr->res[index-1]));
         if (syzstr->res[index+1]->m[ks]!=NULL)
         {
@@ -1104 +953 @@
   
   // Creare dp,S ring and change to it
-  syzstr->syRing = rCurrRingAssure_dp_S();
+  syzstr->syRing = rCurrRingAssure_dp_C();
   assume(syzstr->syRing != origR);
 
@@ -1110 +959 @@
   currcomponents = (int*)Alloc0((arg->rank+1)*sizeof(int));
   currShiftedComponents = (long*)Alloc0((arg->rank+1)*sizeof(long));
-  for (i=0;i<=arg->rank;i++)
-  {
-    currShiftedComponents[i] = (i)*SYZ_SHIFT_BASE;
-    currcomponents[i] = i;
-  }
-  rChangeSComps(currcomponents, currShiftedComponents, arg->rank);
 
 /*--- initializes the data structures---------------*/
@@ -1168 +1011 @@
     else
       i = syInitSyzMod(syzstr,index);
-    currcomponents = syzstr->truecomponents[max(index-1,0)];
-    currShiftedComponents = syzstr->ShiftedComponents[max(index-1,0)];
-    rChangeSComps(currcomponents, currShiftedComponents,
-                  IDELEMS(syzstr->res[max(index-1,0)]));
     j = syInitSyzMod(syzstr,index+1);
     if (index>0)