Changeset 750e70 in git for Singular/ipshell.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:

• Singular/ipshell.cc (modified) (8 diffs)

Singular/ipshell.cc

@@ -2567 +2567 @@
      (*weights) -= add_row_shift;
   }
-  
+
   res->data=(void *)syBettiOfComputation(syzstr,minim,&row_shift,weights);
   //row_shift += add_row_shift;
@@ -2597 +2597 @@
   {
     if (syzstr->hilb_coeffs==NULL)
-    {
+    { // La Scala
       fullres = syReorder(syzstr->res, length, syzstr);
     }
     else
-    {
+    { // HRES
       minres = syReorder(syzstr->orderedRes, length, syzstr);
       syKillEmptyEntres(minres, length);
@@ -2614 +2614 @@
   else
     tr = fullres;
-  
+
   resolvente trueres=NULL; intvec ** w=NULL;
 
@@ -2638 +2638 @@
     }
   }
-  
+
   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);
@@ -2654 +2654 @@
       syzstr->minres = minres;
   }
-  
+
   return li;
 
-  
+
 }
 
@@ -4614 +4614 @@
           case ringorder_s: // no 'rank' params!
           {
-            
+
             if(iv->length() > 3)
               return TRUE;
@@ -4621 +4621 @@
             {
               const int s = (*iv)[2];
-              R->block0[n] = s;            
+              R->block0[n] = s;
               R->block1[n] = s;
             }
-            break;            
+            break;
           }
           case ringorder_IS:
           {
             if(iv->length() != 3) return TRUE;
-            
+
             const int s = (*iv)[2];
 
             if( 1 < s || s < -1 ) return TRUE;
-              
-            R->block0[n] = s;            
+
+            R->block0[n] = s;
             R->block1[n] = s;
             break;
-          }            
+          }
           case ringorder_S:
           case ringorder_c:
@@ -4718 +4718 @@
 
   assume( n >= 0 );
-  
+
   if (R->block1[n] != R->N)
   {