Changeset 22579cf in git for Singular

Timestamp:

Mar 15, 2011, 7:17:44 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

273fed0aea0c3cb00dc08f02c5d5340a2a781f23

Parents:

91b031a4e88cb480f4ba993bf5904694c62d9b34

Message:

FIX: betti and convertion to list should not change a resolution (syzstr)!
FIX: La Scala must return min/full-res and should forget about syRing!
FIX: is syRing NOT needed after La Scala resolution is finished...
FIX: printing of resolution will not change the resolution anymore? (convetion to list?)

From: Oleksandr Motsak <motsak@mathematik.uni-kl.de>

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

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• ipconv.cc (modified) (1 diff)
• ipshell.cc (modified) (6 diffs)
• subexpr.cc (modified) (1 diff)

Singular/iparith.cc

@@ -2983 +2983 @@
     }
   }
+
+  // test the La Scala case' output
+  assume( (iiOp == LRES_CMD) == (r->syRing != NULL) );
+  assume( (iiOp == LRES_CMD) == (r->resPairs != NULL) );
+  assume( (r->minres != NULL) || (r->fullres != NULL) );
+
   return FALSE;
 }
@@ -4190 +4196 @@
 {
   intvec *weights=(intvec*)atGet(v,"isHomog",INTVEC_CMD);
-  res->data=(char *)syMinimize((syStrategy)v->Data());
+
+  syStrategy tmp=(syStrategy)v->Data();
+  tmp = syMinimize(tmp); // enrich itself!
+
+  res->data=(char *)tmp; 
+  
   if (weights!=NULL)
     atSet(res, omStrDup("isHomog"),ivCopy(weights),INTVEC_CMD);
+
   return FALSE;
 }

Singular/ipconv.cc

@@ -236 +236 @@
 
   syStrategy tmp=(syStrategy)in->CopyD();
+
   out->data=(void *)syConvRes(tmp,TRUE,add_row_shift);
 }

Singular/ipshell.cc

@@ -2110 +2110 @@
       }
       R->order[j]=rOrderName(omStrDup((char*)vv->m[0].Data())); // assume STRING
+
       if (j==0) R->block0[0]=1;
       else
@@ -2511 +2512 @@
 {
   syStrategy syzstr=(syStrategy)u->Data();
+
   BOOLEAN minim=(int)(long)w->Data();
   int row_shift=0;
@@ -2522 +2524 @@
      (*weights) -= add_row_shift;
   }
+  
   res->data=(void *)syBettiOfComputation(syzstr,minim,&row_shift,weights);
   //row_shift += add_row_shift;
   //Print("row_shift=%d, add_row_shift=%d\n",row_shift,add_row_shift);
   atSet(res,omStrDup("rowShift"),(void*)add_row_shift,INT_CMD);
+
   return FALSE;
 }
@@ -2542 +2546 @@
 lists syConvRes(syStrategy syzstr,BOOLEAN toDel,int add_row_shift)
 {
-  if ((syzstr->fullres==NULL) && (syzstr->minres==NULL))
+  resolvente fullres = syzstr->fullres;
+  resolvente minres = syzstr->minres;
+
+  const int length = syzstr->length;
+
+  if ((fullres==NULL) && (minres==NULL))
   {
     if (syzstr->hilb_coeffs==NULL)
     {
-      syzstr->fullres = syReorder(syzstr->res,syzstr->length,syzstr);
+      fullres = syReorder(syzstr->res, length, syzstr);
     }
     else
     {
-      syzstr->minres = syReorder(syzstr->orderedRes,syzstr->length,syzstr);
-      syKillEmptyEntres(syzstr->minres,syzstr->length);
-    }
-  }
+      minres = syReorder(syzstr->orderedRes, length, syzstr);
+      syKillEmptyEntres(minres, length);
+    }
+  }
+
   resolvente tr;
   int typ0=IDEAL_CMD;
-  if (syzstr->minres!=NULL)
-    tr = syzstr->minres;
+
+  if (minres!=NULL)
+    tr = minres;
   else
-    tr = syzstr->fullres;
-  resolvente trueres=NULL;
-  intvec ** w=NULL;
-  if (syzstr->length>0)
-  {
-    trueres=(resolvente)omAlloc0((syzstr->length)*sizeof(ideal));
-    for (int i=(syzstr->length)-1;i>=0;i--)
+    tr = fullres;
+  
+  resolvente trueres=NULL; intvec ** w=NULL;
+
+  if (length>0)
+  {
+    trueres = (resolvente)omAlloc0((length)*sizeof(ideal));
+    for (int i=(length)-1;i>=0;i--)
     {
       if (tr[i]!=NULL)
@@ -2576 +2588 @@
     if (syzstr->weights!=NULL)
     {
-      w = (intvec**)omAlloc0((syzstr->length)*sizeof(intvec*));
-      for (int i=(syzstr->length)-1;i>=0;i--)
+      w = (intvec**)omAlloc0(length*sizeof(intvec*));
+      for (int i=length-1;i>=0;i--)
       {
         if (syzstr->weights[i]!=NULL) w[i] = ivCopy(syzstr->weights[i]);
@@ -2583 +2595 @@
     }
   }
-  lists li = liMakeResolv(trueres,syzstr->length,syzstr->list_length,typ0,
-                          w,add_row_shift);
-  if (w != NULL) omFreeSize(w, (syzstr->length)*sizeof(intvec*));
-  if (toDel) syKillComputation(syzstr);
+  
+  lists li = liMakeResolv(trueres, length, syzstr->list_length,typ0,
+                          w, add_row_shift);
+
+  if (w != NULL) omFreeSize(w, length*sizeof(intvec*));
+  
+  if (toDel)
+    syKillComputation(syzstr);
+  else
+  {
+    if( fullres != NULL && syzstr->fullres == NULL )
+      syzstr->fullres = fullres;
+
+    if( minres != NULL && syzstr->minres == NULL )
+      syzstr->minres = minres;
+  }
+  
   return li;
+
+  
 }
 

Singular/subexpr.cc

@@ -144 +144 @@
           break;
         case RESOLUTION_CMD:
-          syPrint((syStrategy)d);
+        {
+          syStrategy tmp=(syStrategy)d; 
+          syPrint(tmp);
           break;
+        }
         case STRING_CMD:
           PrintNSpaces(spaces);