Changeset a14482 in git for Singular/walk.cc

Timestamp:

Feb 26, 2015, 6:55:30 PM (9 years ago)

Author:

Stephan Oberfranz <oberfran@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

e57a75c6d0050e3db7e1a87294a311d4784df43c

Parents:

eca8d9cc9b3584a2f5741c75f69099751c4cbe8f

Message:

update

File:

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

Singular/walk.cc

@@ -1106 +1106 @@
   if(pdeg > nV || pdeg <= 0)
   {
-    WerrorS("//** The perturbed degree is wrong!!");
+    WerrorS("//**MPertVectors: The perturbed degree is wrong!!");
     return v_null;
   }
@@ -1116 +1116 @@
   }
   mpz_t *pert_vector = (mpz_t*)omAlloc(nV*sizeof(mpz_t));
-  //mpz_t *pert_vector1 = (mpz_t*)omAlloc(nV*sizeof(mpz_t));
 
   for(i=0; i<nV; i++)
@@ -1123 +1122 @@
    // mpz_init_set_si(pert_vector1[i], (*ivtarget)[i]);
   }
-  // Calculate max1 = Max(A2)+Max(A3)+...+Max(Apdeg),
+  // Compute max1 = Max(A2)+Max(A3)+...+Max(Apdeg),
   // where the Ai are the i-te rows of the matrix target_ord.
   int ntemp, maxAi, maxA=0;
@@ -1148 +1147 @@
   }
 
-  // Calculate inveps = 1/eps, where 1/eps > totaldeg(p)*max1 for all p in G.
+  // Compute inveps = 1/eps, where 1/eps > totaldeg(p)*max1 for all p in G.
 
   intvec* ivUnit = Mivdp(nV);
@@ -1180 +1179 @@
   }
 #else
-  // PrintS("\n// the \"big\" inverse epsilon: ");
+  PrintS("\n //**MPertVectors: the \"big\" inverse epsilon:");
   mpz_out_str(stdout, 10, inveps);
 #endif
@@ -1234 +1233 @@
   if(j > nV - 1)
   {
-    // Print("\n//  MPertVectors: geaenderter vector gleich Null! \n");
+    //perturbed vector equals zero
     delete pert_vector1;
     goto CHECK_OVERFLOW;
   }
 
-// check that the perturbed weight vector lies in the Groebner cone
+  // check that the perturbed weight vector lies in the Groebner cone
   if(test_w_in_ConeCC(G,pert_vector1) != 0)
   {
-    // Print("\n//  MPertVectors: geaenderter vector liegt in Groebnerkegel! \n");
     for(i=0; i<nV; i++)
     {
@@ -1248 +1246 @@
     }
   }
-  else
-  {
-    //Print("\n// MpertVectors: geaenderter vector liegt nicht in Groebnerkegel! \n");
-  }
+
   delete pert_vector1;
 
@@ -1257 +1252 @@
   intvec* result = new intvec(nV);
 
-  /* 2147483647 is max. integer representation in SINGULAR */
+  // 2147483647 is max. integer representation in SINGULAR
   mpz_t sing_int;
   mpz_init_set_ui(sing_int,  2147483647);
@@ -1644 +1639 @@
   {
     mpz_divexact(pert_vector[i], pert_vector[i], ztmp);
-    (* result)[i] = mpz_get_si(pert_vector[i]);
-  }
-
+    (* result1)[i] = mpz_get_si(pert_vector[i]);
+  }
   j = 0;
-  for(i=0; i<nV; i++)
-  {
-    (* result1)[i] = mpz_get_si(pert_vector[i]);
-    (* result1)[i] = 0.1*(* result1)[i];
-    (* result1)[i] = floor((* result1)[i] + 0.5);
-    if((* result1)[i] == 0)
-    {
-      j++;
-    }
-  }
-  if(j > nV - 1)
-  {
-    // Print("\n//  MfPertwalk: geaenderter vector gleich Null! \n");
-    delete result1;
-    goto CHECK_OVERFLOW;
-  }
-
-// check that the perturbed weight vector lies in the Groebner cone
-  if(test_w_in_ConeCC(G,result1) != 0)
-  {
-    // Print("\n//  MfPertwalk: geaenderter vector liegt in Groebnerkegel! \n");
-    delete result;
-    result = result1;
+  while(test_w_in_ConeCC(G,result1) && j<nV)
+  {
+    j = 0;
     for(i=0; i<nV; i++)
     {
+      (* result)[i] = (* result1)[i];
       mpz_set_si(pert_vector[i], (*result1)[i]);
-    }
-  }
-  else
-  {
-    delete result1;
-    // Print("\n// Mfpertwalk: geaenderter vector liegt nicht in Groebnerkegel! \n");
-  }
+      (* result1)[i] = floor(0.1*(mpz_get_si(pert_vector[i])) + 0.5);
+      if((* result1)[i] == 0)
+      {
+        j++;
+      }
+    }
+  }
+  delete result1;
 
   CHECK_OVERFLOW:
@@ -4343 +4319 @@
   assume(currRing != NULL && curr_weight != NULL &&
          target_weight != NULL && G->m[0] != NULL);
-
-  int i,weight_norm,nV = currRing->N;
+  //PrintS("\n //**MWalkRandomNextWeight: Anfang ok!\n");
+  int i,k,nV = currRing->N;
+  long weight_norm;
   intvec* next_weight2;
-  intvec* next_weight22 = new intvec(nV);
+  //intvec* next_weight22 = new intvec(nV);
   intvec* result = new intvec(nV);
+  ideal G_test;
+  ideal G_test2;
+  BOOLEAN random = FALSE;
 
   intvec* next_weight1 =MkInterRedNextWeight(curr_weight,target_weight,G);
   //compute a random next weight vector "next_weight2"
-  while(1)
-  {
+  k = 1;
+  while(k<4)
+  {
+    k++;
     weight_norm = 0;
+    intvec* next_weight22 = new intvec(nV);
     while(weight_norm == 0)
     {
-
+      //PrintS("\nWhile WeightNorm\n");
       for(i=0; i<nV; i++)
       {
-        (*next_weight22)[i] = rand() % 60000 - 30000;
+        (*next_weight22)[i] = rand() % 60000 ;
         weight_norm = weight_norm + (*next_weight22)[i]*(*next_weight22)[i];
       }
+      //Print("\n// weight_norm vor Wurzel = %d\n", weight_norm);
       weight_norm = 1 + floor(sqrt(weight_norm));
-    }
-
+      
+    }
+//Print("\n// weight_norm nach Wurzel = %d\n", weight_norm);
     for(i=0; i<nV; i++)
     {
       if((*next_weight22)[i] < 0)
       {
-        (*next_weight22)[i] = 1 + (*curr_weight)[i] + floor(weight_rad*(*next_weight22)[i]/weight_norm);
+        (*next_weight22)[i] = 1 + (*curr_weight)[i] + floor((weight_rad)*(*next_weight22)[i]/weight_norm);
       }
       else
       {
-        (*next_weight22)[i] = (*curr_weight)[i] + floor(weight_rad*(*next_weight22)[i]/weight_norm);
+        (*next_weight22)[i] = (*curr_weight)[i] + floor((weight_rad)*(*next_weight22)[i]/weight_norm);
       }
     }
@@ -4379 +4364 @@
     if(test_w_in_ConeCC(G, next_weight22) == 1)
     {
+      //PrintS("\n //** MWalkRandomNextWeight: test ob in Kegel.\n");
       next_weight2 = MkInterRedNextWeight(next_weight22,target_weight,G);
       if(MivAbsMax(next_weight2)>1147483647)
@@ -4395 +4381 @@
         }
       }
-      delete next_weight22;
+      random = TRUE;
       break;
     }
-  }
-  
+    delete next_weight22;
+  }
+  //PrintS("\n //**MWalkRandomNextWeight: Ende while-Schleife!\n");
+
   // compute "usual" next weight vector
   intvec* next_weight = MwalkNextWeightCC(curr_weight,target_weight, G);
-  ideal G_test = MwalkInitialForm(G, next_weight);
-  ideal G_test2 = MwalkInitialForm(G, next_weight2);
-
+  G_test = MwalkInitialForm(G, next_weight);
+  if(random == TRUE)
+  {
+    G_test2 = MwalkInitialForm(G, next_weight2);
+  }
   // compare next weights
   if(Overflow_Error == FALSE)
   {
     ideal G_test1 = MwalkInitialForm(G, next_weight1);
-    if(G_test1->m[0] != NULL && maxlengthpoly(G_test1) < maxlengthpoly(G_test))//if(IDELEMS(G_test1) < IDELEMS(G_test))
-    {
-      if(G_test2->m[0] != NULL && maxlengthpoly(G_test2) < maxlengthpoly(G_test1)) //if(IDELEMS(G_test2) < IDELEMS(G_test1))
-      {
-        // |G_test2| < |G_test1| < |G_test|
+    if(G_test1->m[0] != NULL && maxlengthpoly(G_test1) < maxlengthpoly(G_test))
+    {
+      if(random == TRUE &&
+         G_test2->m[0] != NULL &&
+         maxlengthpoly(G_test2) < maxlengthpoly(G_test1))
+      {
         for(i=0; i<nV; i++)
         {
@@ -4421 +4412 @@
       else
       {
-        // |G_test1| < |G_test|, |G_test1| <= |G_test2|
         for(i=0; i<nV; i++)
         {
@@ -4430 +4420 @@
     else
     {
-      if(G_test2->m[0] != NULL && maxlengthpoly(G_test2) < maxlengthpoly(G_test))//if(IDELEMS(G_test2) < IDELEMS(G_test)) // |G_test2| < |G_test| <= |G_test1|
+      if(random == TRUE &&
+         G_test2->m[0] != NULL &&
+         maxlengthpoly(G_test2) < maxlengthpoly(G_test))
       {
         for(i=0; i<nV; i++)
@@ -4439 +4431 @@
       else
       {
-        // |G_test| < |G_test1|, |G_test| <= |G_test2|
         for(i=0; i<nV; i++)
         {
@@ -4451 +4442 @@
   {
     Overflow_Error = FALSE;
-    if(G_test2->m[0] != NULL && maxlengthpoly(G_test2) < maxlengthpoly(G_test))//if(IDELEMS(G_test2) < IDELEMS(G_test))
+    if(random == TRUE && 
+       G_test2->m[0] != NULL &&
+       maxlengthpoly(G_test2) < maxlengthpoly(G_test))
     {
       for(i=1; i<nV; i++)
@@ -4466 +4459 @@
     }
   }
-  PrintS("\n MWalkRandomNextWeight: Ende ok!\n");
+  //PrintS("\n MWalkRandomNextWeight: Ende ok!\n");
   idDelete(&G_test);
-  idDelete(&G_test2);
+  if(random == TRUE)
+  {
+    idDelete(&G_test2);
+  }
   if(test_w_in_ConeCC(G, result) == 1)
   {
-    delete next_weight2;
+    if(random == TRUE)
+    {
+      delete next_weight2;
+    }
     delete next_weight;
     delete next_weight1;
@@ -4479 +4478 @@
   {
     delete result;
-    delete next_weight2;
+    if(random == TRUE)
+    {
+      delete next_weight2;
+    }
     delete next_weight1;
     return next_weight;
@@ -6029 +6031 @@
     to=clock();
     // compute a next weight vector
-    next_weight = MkInterRedNextWeight(curr_weight,target_weight, G);
+    next_weight = MwalkNextWeightCC(curr_weight,target_weight,G);//MkInterRedNextWeight(curr_weight,target_weight, G);
     tnw=tnw+clock()-to;
 //#ifdef PRINT_VECTORS
@@ -7095 +7097 @@
       delete next_vect;
       next_vect = MWalkRandomNextWeight(G,omega,omega2,weight_rad,nlev);
-      if(isNegNolVector(next_vect)==1)
+      if(isNegNolVector(next_vect)==1 || MivSame(omega,next_vect) == 1)
       {
         delete next_vect;
@@ -7180 +7182 @@
           delete next_vect;
           next_vect = MWalkRandomNextWeight(G,omega,omega2,weight_rad,nlev);
-          if(isNegNolVector(next_vect)==1)
+          if(isNegNolVector(next_vect)==1 || MivSame(omega,next_vect) == 1)
           {
             delete next_vect;
@@ -7239 +7241 @@
         Print("\n//** rec_r_fractal_call: Leaving the %d-th recursion with %d steps.\n",
               nlev, nwalks);
-        //Print(" ** Overflow_Error? (%d)", Overflow_Error);
+      /*
+        Print(" ** Overflow_Error? (%d)", Overflow_Error);
+        idString(G1,"//** rec_r_fractal_call: G1");
+      */
       }
       nnflow ++;
@@ -7279 +7284 @@
           Print("\n//** rec_r_fractal_call: Leaving the %d-th recursion with %d steps.\n",
                 nlev, nwalks);
-          //Print(" ** Overflow_Error? (%d)", Overflow_Error);
+        /*
+          Print(" ** Overflow_Error? (%d)", Overflow_Error);
+          idString(Gt,"//** rec_r_fractal_call: Gt");
+        */
         }
         return (Gt);
@@ -7382 +7390 @@
           Print("\n//** rec_r_fractal_call: Leaving the %d-th recursion with %d steps.\n",
                 nlev,nwalks);
-          //Print(" ** Overflow_Error? (%d)", Overflow_Error);
+         /*
+          Print(" ** Overflow_Error? (%d)", Overflow_Error);
+          idString(G,"//** rec_r_fractal_call: G");
+         */
         }
         if(Overflow_Error == TRUE)