Changeset bc55ff in git

Timestamp:

Nov 25, 2015, 9:32:39 AM (8 years ago)

Author:

Stephan Oberfranz <oberfran@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

9276009fd8f4c23b5ebab4a73a6f387cf0688943

Parents:

c448cd0bc7b9b6f619a671e1e5605d3671864988

Message:

fix bug

Location:

Singular

Files:

• LIB/grwalk.lib (modified) (1 diff)
• LIB/modwalk.lib (modified) (1 diff)
• LIB/rwalk.lib (modified) (3 diffs)
• walk.cc (modified) (8 diffs)

Singular/LIB/grwalk.lib

@@ -368 +368 @@
    string ord_str =   OSCTW[2];
    intvec curr_weight   =   OSCTW[3]; /* original weight vector */
-   intvec target_weight =   OSCTW[4]; /* terget weight vector */
+   intvec target_weight =   OSCTW[4]; /* target weight vector */
    kill OSCTW;
    option(redSB);

Singular/LIB/modwalk.lib

@@ -386 +386 @@
     /* compute command(args) */
     exstr = "Ip = "+command+" (Ip";
-    exstr;
+
     for(i=2; i<=size(Arg); i++) {
       exstr = exstr+",Arg["+string(eval(i))+"]";
       }
     exstr = exstr+");";
-    exstr;
+
     execute(exstr);
-    /*
-    if(size(Arg)==1) {
-      execute("Ip = "+command+"(Ip);");
-      }
-    if(size(Arg)==2) {
-         execute("Ip = "+command+"(Ip,Arg[2]);");
-      }
-    if(size(Arg)==3) {
-        execute("Ip = "+command+"(Ip,Arg[2],Arg[3]);");
-     }
-*/
 
     /* test if Gp is in Ip */

Singular/LIB/rwalk.lib

@@ -219 +219 @@
 //--------------------  Initialize parameters  ------------------------
 list OSCTW = OrderStringalp_NP("al", #);
-if(size(#)>1)
-  {
-  if(size(#[2]) == n*n)
-    {
-    OSCTW= OrderStringalp_NP("M", #);
-    }
-  }
-else
-  {
-  OSCTW= OrderStringalp_NP("al", #);
-  }
 int nP = OSCTW[1];
 string ord_str = OSCTW[2];
@@ -274 +263 @@
          frwalk(ideal i, int radius, intvec v, intvec w);
 TYPE:    ideal
-PURPOSE: compute the standard basis of the ideal, calculated via
-         the Random Fractal walk algorithm  from the ordering
-         \"(a(v),lp)\", \"dp\", \"Dp\" or \"M\"
-         to the ordering  \"(a(w),lp)\", \"(a(1,0,...,0),lp)\" or \"M\".
+PURPOSE: compute the standard basis of the ideal w.r.t. the
+         lexicographical ordering or a weighted-lex ordering,
+         calculated via the Random Fractal walk algorithm.
 SEE ALSO: std, stdfglm, groebner, gwalk, pwalk, twalk, awalk1, awalk2
 KEYWORDS: The fractal walk algorithm
@@ -284 +272 @@
    // we use ring with ordering (a(...),lp,C)
    list OSCTW    = OrderStringalp_NP("al", #);
-   int n=nvars(basering);
-   if(size(#)>1)
-   {
-     if(size(#[2]) == n*n)
-     {
-       OSCTW= OrderStringalp_NP("M", #);
-     }
-   }
-  else
-  {
-    OSCTW= OrderStringalp_NP("al", #);
-  }
    string ord_str =   OSCTW[2];
    intvec curr_weight   =   OSCTW[3]; /* current weight vector */

Singular/walk.cc

@@ -6678 +6678 @@
 
     if(target_M->length() == nV)
-    {
+    {/*
       // define a new ring with ordering "(a(curr_weight),lp)
       if (rParameter(currRing) != NULL)
@@ -6684 +6684 @@
       else
         rChangeCurrRing(VMrDefault(curr_weight));
+*/
+      rChangeCurrRing(VMrRefine(target_M,curr_weight));
     }
     else
@@ -7033 +7035 @@
   //intvec* altomega = new intvec(nV);
 
-  for(i = nV -1; i=0; i--)//Aenderung!!
+  for(i = nV -1; i>=0; i--)//Aenderung!!
   {
     (*omtmp)[i] = (*ivtarget)[i];
@@ -7534 +7536 @@
   //BOOLEAN isnewtarget = FALSE;
 
-  for(i = nV -1; i=0; i--)
+  for(i = nV -1; i>=0; i--)
   {
     (*omtmp)[i] = (*ivtarget)[i];
@@ -8229 +8231 @@
 
   J = rec_fractal_call(J,1,ivtarget,reduction,printout);
-  idString(J,"//** Mfwalk: J");
+  //idString(J,"//** Mfwalk: J");
   rChangeCurrRing(oldRing);
-  Print("\n//Mfwalk: (2)\n");
+  //Print("\n//Mfwalk: (2)\n");
   resF = idrMoveR(J, helpRing,currRing);
-  Print("\n//Mfwalk: (3)\n");
+  //Print("\n//Mfwalk: (3)\n");
   idSkipZeroes(resF);
-  Print("\n//Mfwalk: (4)\n");
+  //Print("\n//Mfwalk: (4)\n");
 
   si_opt_1 = save1; //set original options, e. g. option(RedSB)
   delete Xivlp;
-  delete Xsigma;
+  //delete Xsigma;
   delete Xtau;
   delete XivNull;
-Print("\n//Mfwalk: (5)\n");
+  //Print("\n//Mfwalk: (5)\n");
 #ifdef TIME_TEST
   TimeStringFractal(xftinput, xftostd, xtif, xtstd, xtextra,
@@ -8252 +8254 @@
   Print("\n// the numbers of Overflow_Error (%d)", nnflow);
 #endif
-Print("\n//Mfwalk: (6)\n");
-  idString(resF,"//** Mfwalk: resF");
+  //Print("\n//Mfwalk: (6)\n");
+  //idString(resF,"//** Mfwalk: resF");
   return(idCopy(resF));
 }
@@ -8416 +8418 @@
 
   J = rec_r_fractal_call(J,1,ivtarget,weight_rad,reduction,printout);
-idString(J,"//*** Mfrwalk: J");
-Print("\n//** Mfrwalk hier (1)\n");
+  //idString(J,"//*** Mfrwalk: J");
+  //Print("\n//** Mfrwalk hier (1)\n");
   rChangeCurrRing(oldRing);
-Print("\n//** Mfrwalk hier (2)\n");
+  //Print("\n//** Mfrwalk hier (2)\n");
   resF = idrMoveR(J, helpRing,currRing);
-Print("\n//** Mfrwalk hier (3)\n");
+  //Print("\n//** Mfrwalk hier (3)\n");
   //idSkipZeroes(resF);
-Print("\n//** Mfrwalk hier (4)\n");
+  //Print("\n//** Mfrwalk hier (4)\n");
   si_opt_1 = save1; //set original options, e. g. option(RedSB)
   delete Xivlp;
-  delete Xsigma;
+  //delete Xsigma;
   delete Xtau;
   delete XivNull;
-Print("\n//** Mfrwalk hier (5)\n");
+  //Print("\n//** Mfrwalk hier (5)\n");
 #ifdef TIME_TEST
   TimeStringFractal(xftinput, xftostd, xtif, xtstd, xtextra,
@@ -8439 +8441 @@
   Print("\n// the numbers of Overflow_Error (%d)", nnflow);
 #endif
-Print("\n//** Mfrwalk hier (6)\n");
-idString(resF,"resF");
-Print("\n//** Mfrwalk hier (7)\n");
+  //Print("\n//** Mfrwalk hier (6)\n");
+  //idString(resF,"resF");
+  //Print("\n//** Mfrwalk hier (7)\n");
   return(resF);
 }