Changeset 750e70 in git for kernel/syz1.cc

Timestamp:

May 5, 2011, 7:20:56 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

eb72ba1a1a50ca741a3113bf9b8bc34d414a678a

Parents:

1f9a84fc8a205c643ce861d9e20c25dc687aa193

Message:

ADD: new option(notSyzMinim) should switch off all resolution minimizations (lres/nres/mres)

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

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

File:

• kernel/syz1.cc (modified) (12 diffs)

kernel/syz1.cc

@@ -1642 +1642 @@
       if(syzstr->syRing->typ[1].ord_typ == ro_syzcomp)
         rNChangeSComps(NULL, NULL, syzstr->syRing);
-      
+
       rKill(syzstr->syRing);
     }
@@ -1797 +1797 @@
   resolvente minres = syzstr->minres;
   const int length = syzstr->length;
-  
+
   if ((fullres==NULL) && (minres==NULL))
   {
      if (syzstr->hilb_coeffs==NULL)
-     {
+     { // LA SCALA
         fullres = syReorder(syzstr->res, length, syzstr);
      }
      else
-     {
+     { //  HRES
         minres = syReorder(syzstr->orderedRes, length, syzstr);
         syKillEmptyEntres(minres, length);
      }
   }
-  
+
   intvec *result=NULL;
-  
+
   if (fullres!=NULL)
     result = syBetti(fullres,length,&dummy,weights,minim,row_shift);
@@ -1833 +1833 @@
     syzstr->betti = ivCopy(result); // cache the result...
   }
-  
+
   return result;
 }
@@ -1957 +1957 @@
 
   intvec* resolution = syzstr->resolution;
-  
+
   if (resolution==NULL)
   {
@@ -2043 +2043 @@
   }
 
-  if (syzstr->resolution == NULL) syzstr->resolution = resolution; 
+  if (syzstr->resolution == NULL) syzstr->resolution = resolution;
 }
 
@@ -2411 +2411 @@
       if (syzstr->hilb_coeffs==NULL)
       {
+        // La Scala Resolution
         syzstr->minres = syReadOutMinimalRes(syzstr);
       }
       else
-      {
+      { // HRES
         syzstr->minres = syReorder(syzstr->orderedRes,syzstr->length,syzstr);
       }
@@ -2538 +2539 @@
   if (temp!=NULL) idDelete(&temp);
   kBucketDestroy(&(syzstr->bucket));
+
   if (origR != syzstr->syRing)
     rChangeCurrRing(origR);
@@ -2544 +2546 @@
   if (TEST_OPT_PROT) PrintLn();
 
-  if (syzstr->minres==NULL)
-      if (syzstr->resPairs!=NULL)
-        if (syzstr->hilb_coeffs==NULL)
-          syzstr->minres = syReadOutMinimalRes(syzstr);
-  
+  assume(syzstr->minres==NULL); assume(syzstr->fullres ==NULL);
+  assume(syzstr->resPairs!=NULL);  assume(syzstr->hilb_coeffs==NULL);
+  assume(syzstr->res!=NULL);
+
+  if(! TEST_OPT_NO_SYZ_MINIM )
+    syzstr->minres = syReadOutMinimalRes(syzstr);
+  else
+    syzstr->fullres = syReorder(syzstr->res, syzstr->length, syzstr); // buggy? (betti...?)
+
   return syzstr;
 }
@@ -2570 +2576 @@
   ring origR = currRing;
 
-  if(weights!= NULL) 
+  if(weights!= NULL)
     syzstr->cw = new intvec(weights);
   else
@@ -2588 +2594 @@
   //euler = -1;
   redpol = pInit();
-  
+
   if( maxlength > 0 )
     syzstr->length = maxlength; //  = pVariables+2;
   else
-    syzstr->length = maxlength = pVariables+2;  
+    syzstr->length = maxlength = pVariables+2;
 
   // Creare dp,S ring and change to it
   syzstr->syRing = rCurrRingAssure_dp_S();
   assume(syzstr->syRing != origR);
-  assume(syzstr->syRing->typ[1].ord_typ == ro_syzcomp);  
+  assume(syzstr->syRing->typ[1].ord_typ == ro_syzcomp);
 
 
@@ -2627 +2633 @@
   omFreeSize((ADDRESS)currcomponents,(arg->rank+1)*sizeof(int));
   omFreeSize((ADDRESS)currShiftedComponents,(arg->rank+1)*sizeof(long));
-  
+
   syzstr->res = (resolvente)omAlloc0((maxlength+1)*sizeof(ideal));
   syzstr->orderedRes = (resolvente)omAlloc0((maxlength+1)*sizeof(ideal));
@@ -2641 +2647 @@
 
   assume( syzstr->length == maxlength );
-  
+
   syzstr->bucket = kBucketCreate();
   int len0=idRankFreeModule(temp)+1;