Changeset 7d16bfd in git for Singular/walk.cc

Timestamp:

Nov 25, 2015, 5:53:28 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

3de8ef2ecb36a7d12cbf01da2fe987428f685594

Parents:

cf860bd81a97eb9d7215bc8cc0fbae130cee792e

Message:

fix: PRINT_VECTOR (walk.cc)

File:

• Singular/walk.cc (modified) (28 diffs)

Singular/walk.cc

@@ -20 +20 @@
 
 //#define NEXT_VECTORS_CC
-#define PRINT_VECTORS //to print weight vectors
+//#define PRINT_VECTORS //to print weight vectors
 
 #define INVEPS_SMALL_IN_FRACTAL  //to choose the small invers of epsilon
@@ -990 +990 @@
   assume((iv->length())*(iv->length()) == iw->length());
   int i,j, nR = iv->length();
-  
+
   intvec* ivm = new intvec(nR*nR);
 
@@ -2151 +2151 @@
     {
       (*diff_weight)[j] = (*diff_weight1)[j];
-      mpz_set_si(vec[j], (*diff_weight)[j]);      
+      mpz_set_si(vec[j], (*diff_weight)[j]);
     }
     for(j=0; j<nRing; j++)
@@ -2297 +2297 @@
       for(j=0; j<nRing; j++)
       {
-        (*curr_weight)[j] = (*diff_weight1)[j];  
+        (*curr_weight)[j] = (*diff_weight1)[j];
       }
       for(j=0; j<nRing; j++)
@@ -2831 +2831 @@
 
   // complete ring intializations
-  
+
   rComplete(r);
 
@@ -3256 +3256 @@
 
   ideal Go = idCopy(G);
-  
+
   // check whether leading monomials of G and Gomega coincide
   // and return NULL if not
@@ -3264 +3264 @@
     {
       idDelete(&Go);
-      return NULL; 
+      return NULL;
     }
   }
@@ -3274 +3274 @@
       {
         p = pCopy(Gomega->m[i]);
-        lm = pCopy(Gomega->m[j]);
+        lm = pCopy(Gomega->m[j]);
         pIter(p);
         while(p!=NULL)
@@ -3283 +3283 @@
             {
               middle = TRUE;
-            }
+            }
             factor1 = singclap_pdivide(pHead(p),lm,currRing);
             factor2 = pMult(pCopy(factor1),pCopy(Go->m[j]));
@@ -3303 +3303 @@
   }
   idDelete(&Go);
-  return NULL; 
+  return NULL;
 }
 
@@ -4254 +4254 @@
     next_weight = MkInterRedNextWeight(curr_weight,target_weight, G);
     xtnw=xtnw+clock()-to;
-/*#ifdef PRINT_VECTORS
+#ifdef PRINT_VECTORS
     MivString(curr_weight, target_weight, next_weight);
 #endif
-*/
     if(Overflow_Error == TRUE)
     {
@@ -4292 +4291 @@
         //nOverflow_Error = Overflow_Error;
         tproc=tproc+clock()-tinput;
-        
+
         /*Print("\n// takes %d steps and calls \"Rec_LastGB\" (%d):",
         nwalk, tp_deg+1);
@@ -4703 +4702 @@
     }
   }
-  
+
   // compute "perturbed" next weight vector
   if(pert_deg > 1)
@@ -4716 +4715 @@
   }
   if(MivSame(curr_weight,next_weight)==1 || Overflow_Error == TRUE)
-  { 
+  {
     Overflow_Error = FALSE;
     delete next_weight;
@@ -4745 +4744 @@
             (*result)[i] = (*next_weight1)[i];
           }
-        }    
+        }
       }
       else
@@ -4822 +4821 @@
   }
   if(test_w_in_ConeCC(G, result) == 1 && MivSame(curr_weight,result)==0)
-  { 
+  {
     delete curr_weight;
     delete next_weight1;
@@ -5491 +5490 @@
       PrintS("middle of Cone");
         idDelete(&G);
-        G = idCopy(FF);
-        idDelete(&FF);
+        G = idCopy(FF);
+        idDelete(&FF);
         goto NEXT_VECTOR;
-      } 
+      }
     }
 
@@ -5501 +5500 @@
     {
       hilb_func = hFirstSeries(Gomega,NULL,NULL,curr_weight,currRing);
-    }   
+    }
     else
     {
@@ -5787 +5786 @@
       {
         idDelete(&G);
-        G = idCopy(FF);
-        idDelete(&FF);
+        G = idCopy(FF);
+        idDelete(&FF);
         goto NEXT_VECTOR;
-      } 
+      }
     }
 #ifndef  BUCHBERGER_ALG
@@ -5796 +5795 @@
     {
       hilb_func = hFirstSeries(Gomega,NULL,NULL,curr_weight,currRing);
-    }   
+    }
     else
     {
@@ -6168 +6167 @@
       {
         idDelete(&G);
-        G = idCopy(FF);
-        idDelete(&FF); 
+        G = idCopy(FF);
+        idDelete(&FF);
         goto NEXT_VECTOR;
       }
@@ -6650 +6649 @@
       {
         idDelete(&G);
-        G = idCopy(FF);
-        idDelete(&FF); 
+        G = idCopy(FF);
+        idDelete(&FF);
         goto NEXT_VECTOR;
-      } 
+      }
     }
 
@@ -6702 +6701 @@
         //idElements(Gomega1, "Gw");
         //headidString(Gomega1, "headGw");
-      
+
         PrintS("\n// compute a rGB of Gw:\n");
       }
@@ -7405 +7404 @@
       {
         idDelete(&G);
-        G = idCopy(FF);
-        idDelete(&FF);
-        // Compue next vector. 
+        G = idCopy(FF);
+        idDelete(&FF);
+        // Compue next vector.
         goto NEXT_VECTOR_FRACTAL;
-      } 
+      }
     }
 
@@ -7824 +7823 @@
       }
       else
-      { 
+      {
         if(printout > 0)
         {
@@ -7978 +7977 @@
       {
         idDelete(&G);
-        G = idCopy(FF);
-        idDelete(&FF);
+        G = idCopy(FF);
+        idDelete(&FF);
         /* Compue next vector. */
         goto NEXT_VECTOR_FRACTAL;
-      } 
+      }
     }
 
@@ -8621 +8620 @@
     next_weight = MwalkNextWeightCC(curr_weight,target_weight, G);
     tnw=tnw+clock()-to;
-/*#ifdef PRINT_VECTORS
+#ifdef PRINT_VECTORS
     MivString(curr_weight, target_weight, next_weight);
 #endif
-*/
 
     /* check whether the computed intermediate weight vector is in
@@ -9832 +9830 @@
     next_weight = MkInterRedNextWeight(curr_weight,target_weight, G);
     xtnw=xtnw+clock()-to;
-/*#ifdef PRINT_VECTORS
+#ifdef PRINT_VECTORS
     MivString(curr_weight, target_weight, next_weight);
 #endif
-*/
     if(Overflow_Error == TRUE)
     {