Changeset 633196 in git

Timestamp:

Jun 11, 2015, 4:10:16 PM (8 years ago)

Author:

Stephan Oberfranz <oberfran@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

d52203afadb18a3c05d4c08a2bc18bc327690cd9

Parents:

760258751f1fefe8bd1155f774a95487b0df36f420c1a357575a4f15b08754d8cab675b51b6d79b0

Message:

Merge branch 'spielwiese' of github.com:oberfran/Sources into spielwiese

Files:

• Singular/LIB/standard.lib (modified) (7 diffs)
• Singular/dyn_modules/singmathic/Makefile.am (modified) (1 diff)
• Singular/iparith.cc (modified) (1 diff)
• Singular/iplib.cc (modified) (2 diffs)
• Singular/maps_ip.cc (modified) (3 diffs)
• Singular/walk.cc (modified) (44 diffs)
• Tst/Manual/breakpoint.res.gz.uu (modified) (1 diff)
• doc/reference.doc (modified) (previous)
• libpolys/polys/clapconv.cc (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (2 diffs)
• libpolys/polys/ext_fields/transext.h (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (2 diffs)
• m4/mathic-check.m4 (modified) (2 diffs)
• resources/omFindExec.c (modified) (1 diff)

Singular/LIB/standard.lib

@@ -804 +804 @@
 "SYNTAX: @code{groebner (} ideal_expression @code{)} @*
          @code{groebner (} module_expression @code{)} @*
-         @code{groebner (} ideal_expression@code{,} int_expression @code{)} @*
-         @code{groebner (} module_expression@code{,} int_expression @code{)} @*
          @code{groebner (} ideal_expression@code{,} list of string_expressions
                @code{)} @*
          @code{groebner (} ideal_expression@code{,} list of string_expressions
-               and int_expression @code{)} @*
-         @code{groebner (} ideal_expression@code{,} int_expression @code{)}
+               and int_expression @code{)}
 TYPE:    type of the first argument
 PURPOSE: computes a standard basis of the first argument @code{I}
@@ -829 +826 @@
          afterwards back).
          @code{option(prot)} informs about the chosen method.
-NOTE:    If an additional argument, say @code{wait}, of type int is given,
-         then the computation runs for at most @code{wait} seconds.
-         That is, if no result could be computed in @code{wait} seconds,
-         then the computation is interrupted, 0 is returned, a warning
-         message is displayed, and the global variable
-         @code{Standard::groebner_error} is defined.
-         This feature uses MP and hence it is available on UNIX platforms, only.
 HINT:    Since there exists no uniform best method for computing standard
          bases, and since the difference in performance of a method on
@@ -843 +833 @@
          parameters/variables by integers, etc.). @*
 SEE ALSO: stdhilb, stdfglm, std, slimgb
-KEYWORDS: time limit on computations; MP, groebner basis computations
+KEYWORDS: groebner basis computations
 EXAMPLE: example groebner;  shows an example"
 
@@ -904 +894 @@
   for (k=1; k<=size(#); k++)
   {
-     if (typeof(#[k]) == "int")
-     {
-       int wait = #[k];
-     }
      if (typeof(#[k]) == "string")
      {
@@ -914 +900 @@
      }
   }
-
- //======= we have an argument of type int -- try to use MPfork links =======
-  if ( defined(wait) == voice )
-  {
-    if ( system("with", "MP") )
-    {
-        int j = 10;
-        string bs = nameof(basering);
-        link l_fork = "MPtcp:fork";
-        open(l_fork);
-        write(l_fork, quote(system("pid")));
-        int pid = read(l_fork);
-//        write(l_fork, quote(groebner(eval(i))));
-        write(l_fork, quote(groebner(eval(i),eval(Method))));
-//###Fehlermeldung:
-// ***dError: undef. ringorder used
-// occured at:
-
-        // sleep in small intervalls for appr. one second
-        if (wait > 0)
-        {
-          while(j < 1000000)
-          {
-            if (status(l_fork, "read", "ready", j)) {break;}
-            j = j + j;
-          }
-        }
-
-        // sleep in intervalls of one second from now on
-        j = 1;
-        while (j < wait)
-        {
-          if (status(l_fork, "read", "ready", 1000000)) {break;}
-          j = j + 1;
-        }
-
-        if (status(l_fork, "read", "ready"))
-        {
-          def result = read(l_fork);
-          if (bs != nameof(basering))
-          {
-            def PP = basering;
-            setring P;
-            def result = imap(PP, result);
-            kill PP;
-          }
-          if (defined(groebner_error)==1)
-          {
-            kill groebner_error;
-          }
-          kill l_fork;
-        }
-        else
-        {
-          ideal result;
-          if (! defined(groebner_error))
-          {
-            int groebner_error = 1;
-            export groebner_error;
-          }
-          "** groebner did not finish";
-          j = system("sh", "kill " + string(pid));
-        }
-        return (result);
-    }
-    else
-    {
-      "** groebner with a time limit on computation is not supported
-          in this configuration";
-    }
-  }
-
- //=========== we are still here -- do the actual computation =============
 
 //--------------------- save data from basering ---------------------------
@@ -1065 +978 @@
   if( find(method,"hilb") && !find(method,"fglm") )
   {
-     conversion = "hilb"; // $Id$
+     conversion = "hilb";
   }
   if( find(method,"fglm") && !find(method,"hilb") )
   {
-    conversion = "fglm"; // $Id$
+    conversion = "fglm";
   }
   if( find(method,"fglm") && find(method,"hilb") )
   {
-    conversion = "hilborfglm"; // $Id$
+    conversion = "hilborfglm";
   }
   if( !find(method,"fglm") && !find(method,"hilb") )
   {
-    conversion = "no"; // $Id$
+    conversion = "no";
   }
 
@@ -2532 +2445 @@
 static proc mod_init()
 {
+  if(!defined(Singmathic))
+  {
+    load("singmathic.so","try");
+  }
   //int pagelength=24;
   //exportto(Top,pagelength);

Singular/dyn_modules/singmathic/Makefile.am

@@ -20 +20 @@
 singmathic_la_SOURCES  = singmathic.cc
 singmathic_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
-singmathic_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS}
+singmathic_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS} ${MATHIC_LIBS}
 
 # AM_COLOR_TESTS=always

Singular/iparith.cc

@@ -5341 +5341 @@
   WerrorS_dummy_cnt=0;
   BOOLEAN bo=jjLOAD(s,TRUE);
-  if (bo || (WerrorS_dummy_cnt>0)) Print("loading of >%s< failed\n",s);
+  if (TEST_OPT_PROT && (bo || (WerrorS_dummy_cnt>0)))
+    Print("loading of >%s< failed\n",s);
   WerrorS_callback=WerrorS_save;
   errorreported=0;

Singular/iplib.cc

@@ -1092 +1092 @@
     Werror("dynl_open failed:%s", dynl_error());
     Werror("%s not found", newlib);
+    killhdl2(pl,&(basePack->idroot),NULL); // remove package
     goto load_modules_end;
   }
@@ -1119 +1120 @@
       RET=FALSE;
     }
-    else Werror("mod_init not found:: %s\nThis is probably not a dynamic module for Singular!\n", dynl_error());
+    else
+    {
+      Werror("mod_init not found:: %s\nThis is probably not a dynamic module for Singular!\n", dynl_error());
+      killhdl2(pl,&(basePack->idroot),NULL); // remove package
+    }
   }
 

Singular/maps_ip.cc

@@ -264 +264 @@
 
       number d = n_GetDenom(p_GetCoeff(p, currRing), currRing);
-      p_Test((poly)NUM(d), R);
+      p_Test((poly)NUM((fraction)d), R);
 
       if ( n_IsOne (d, currRing->cf) )
@@ -270 +270 @@
         n_Delete(&d, currRing); d = NULL;
       }
-      else if (!p_IsConstant((poly)NUM(d), R))
+       else if (!p_IsConstant((poly)NUM((fraction)d), R))
       {
         WarnS("ignoring denominators of coefficients...");
@@ -279 +279 @@
       memset(&tmpW,0,sizeof(sleftv));
       tmpW.rtyp = POLY_CMD;
-      p_Test((poly)NUM(num), R);
-
-      tmpW.data = NUM (num); // a copy of this poly will be used
-
-      p_Normalize(NUM(num),R);
+      p_Test((poly)NUM((fraction)num), R);
+
+      tmpW.data = NUM ((fraction)num); // a copy of this poly will be used
+
+      p_Normalize(NUM((fraction)num),R);
       if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,R,NULL,NULL,0,nMap))
       {

Singular/walk.cc

@@ -806 +806 @@
   for(i=nG-1; i>=0; i--)
   {
-    mi = MpolyInitialForm(G->m[i], iv);
-    gi = G->m[i];
-
+    mi = pHead(MpolyInitialForm(G->m[i], iv));
+    //Print("\n **// test_w_in_ConeCC: lm(initial)= %s \n",pString(mi));
+    gi = pHead(G->m[i]);
+    //Print("\n **// test_w_in_ConeCC: lm(ideal)= %s \n",pString(gi));
     if(mi == NULL)
     {
@@ -1646 +1647 @@
     (* result)[i] = mpz_get_si(pert_vector[i]);
   }
-
+/*
   j = 0;
-  for(i=0; i<nV; i++)
+  for(i=0; i<niv; i++)
   {
     (* result1)[i] = mpz_get_si(pert_vector[i]);
@@ -1658 +1659 @@
     }
   }
-  if(j > nV - 1)
+  if(j > niv - 1)
   {
     // Print("\n//  MfPertwalk: geaenderter vector gleich Null! \n");
@@ -1664 +1665 @@
     goto CHECK_OVERFLOW;
   }
-
+/*
 // check that the perturbed weight vector lies in the Groebner cone
+  Print("\n========================================\n//** MfPertvector: test in Cone.\n");
   if(test_w_in_ConeCC(G,result1) != 0)
   {
@@ -1681 +1683 @@
     // Print("\n// Mfpertwalk: geaenderter vector liegt nicht in Groebnerkegel! \n");
   }
-
+  Print("\n ========================================\n");*/
   CHECK_OVERFLOW:
 
@@ -5043 +5045 @@
   Set_Error(FALSE);
   Overflow_Error = FALSE;
-  BOOLEAN endwalks = FALSE;
+  //BOOLEAN endwalks = FALSE;
 #ifdef TIME_TEST
   clock_t tinput, tostd, tif=0, tstd=0, tlift=0, tred=0, tnw=0;
@@ -5057 +5059 @@
   ring newRing;
   ring XXRing = baseRing;
+  ring targetRing;
   intvec* ivNull = new intvec(nV);
   intvec* curr_weight = new intvec(nV);
@@ -5065 +5068 @@
   for(i=0; i<nV; i++)
   {
-    (*tmp_weight)[i] = (*target_M)[i];
+    (*tmp_weight)[i] = (*orig_M)[i];
   }
 */
@@ -5090 +5093 @@
   }
 //#endif
+
+  if(target_M->length() == nV)
+  {
+   // define the target ring
+    targetRing = VMrDefault(target_weight);
+  }
+  else
+  {
+    targetRing = VMatrDefault(target_M);
+  }
+  if(orig_M->length() == nV)
+  {
+    // define a new ring with ordering "(a(curr_weight),lp)
+    newRing = VMrDefault(curr_weight);
+  }
+  else
+  {
+    newRing = VMatrDefault(orig_M);
+  }
+  rChangeCurrRing(newRing);
+
 #ifdef TIME_TEST
   to = clock();
 #endif
-  if(orig_M->length() == nV)
-  {
-    // define a new ring with ordering "(a(curr_weight),lp)
-    newRing = VMrDefault(curr_weight);
-  }
-  else
-  {
-    newRing = VMatrDefault(orig_M);
-  }
-  rChangeCurrRing(newRing);
+
   ideal G = MstdCC(idrMoveR(Go,baseRing,currRing));
-  //ideal G = idrMoveR(Go,baseRing,currRing);
-  baseRing = currRing;
+
 #ifdef TIME_TEST
   tostd = clock()-to;
 #endif
 
+  baseRing = currRing;
   nwalk = 0;
+
   while(1)
   {
     nwalk ++;
     nstep ++;
+
 #ifdef TIME_TEST
     to = clock();
 #endif
-//#ifdef CHECK_IDEAL_MWALK
-    if(printout > 2)
-    {
-      idString(G,"//** Mwalk: G");
-    }
-//#endif
-    // test whether target cone is reached
-    if(reduction !=0 && test_w_in_ConeCC(G,target_weight) == 1)
-    {
-      endwalks = TRUE;
-    }
     // compute an initial form ideal of <G> w.r.t. "curr_vector"
     Gomega = MwalkInitialForm(G, curr_weight);
 #ifdef TIME_TEST
-    //time for computing initial form ideal
     tif = tif + clock()-to;
 #endif
+
 //#ifdef CHECK_IDEAL_MWALK
     if(printout > 1)
@@ -5141 +5147 @@
     }
 //#endif
+
     if(reduction == 0)
     {
-      //PrintS("\n//** Mwalk: test middle of cone!\n");
       FF = middleOfCone(G,Gomega);
-      //PrintS("\n//** Mwalk: Test F!\n");
       if( FF != NULL)
       {
@@ -5151 +5156 @@
         G = idCopy(FF);
         idDelete(&FF);
-        //PrintS("\n//** Mwalk: FF nicht NULL! Compue next vector.\n");
         goto NEXT_VECTOR;
       } 
     }
+
 #ifndef  BUCHBERGER_ALG
     if(isNolVector(curr_weight) == 0)
@@ -5165 +5170 @@
     }
 #endif
+
     if(nwalk == 1)
     {
@@ -5181 +5187 @@
      if(target_M->length() == nV)
      {
-       //define a new ring with ordering "(a(curr_weight),Wp(target_weight))"
-       newRing = VMrRefine(curr_weight,target_weight);
+       //define a new ring with ordering "(a(curr_weight),lp)"
+       newRing = VMrDefault(curr_weight);
      }
      else
@@ -5225 +5231 @@
     // where Gomega is a reduced Groebner basis w.r.t. the current ring
     F = MLifttwoIdeal(Gomega2, M1, G);
+
 #ifdef TIME_TEST
     tlift = tlift + clock() - to;
@@ -5236 +5243 @@
     idDelete(&Gomega2);
     idDelete(&M1);
+
     rChangeCurrRing(newRing); // change the ring to newRing
     G = idrMoveR(F,baseRing,currRing);
     idDelete(&F);
+    idSkipZeroes(G);
+
+//#ifdef CHECK_IDEAL_MWALK
+    if(printout > 2)
+    {
+      idString(G, "//** Mwalk: G");
+    }
+//#endif
+
+    rChangeCurrRing(targetRing);
+    G = idrMoveR(G,newRing,currRing);
+    // test whether target cone is reached
+    if(reduction !=0 && test_w_in_ConeCC(G,curr_weight) == 1)
+    {
+      baseRing = currRing;
+      break;
+      //endwalks = TRUE;
+    }
+
+    rChangeCurrRing(newRing);
+    G = idrMoveR(G,targetRing,currRing);
     baseRing = currRing;
+
+/*
 #ifdef TIME_TEST
     to = clock();
@@ -5247 +5278 @@
     tstd = tstd + clock() - to;
 #endif
-    idSkipZeroes(G);
-//#ifdef CHECK_IDEAL_MWALK
-    if(printout > 2)
-    {
-      idString(G, "//** Mwalk: G");
-    }
-//#endif
+*/
+
+
 #ifdef TIME_TEST
     to = clock();
@@ -5268 +5295 @@
     }
 //#endif
-    if(MivComp(target_weight,curr_weight) == 1 || endwalks == TRUE)
-    {
-
+    if(MivComp(target_weight,curr_weight) == 1)// || endwalks == TRUE)
+    {/*
 //#ifdef CHECK_IDEAL_MWALK
       if(printout > 0)
@@ -5328 +5354 @@
       to = clock();
 #endif
-      /*PrintS("\n //**Mwalk: Interreduce");
+      //PrintS("\n //**Mwalk: Interreduce");
       //interreduce the Groebner basis <G> w.r.t. currRing
-      G = kInterRedCC(G,NULL);*/
+      //G = kInterRedCC(G,NULL);
 #ifdef TIME_TEST
       tred = tred + clock() - to;
 #endif
       idSkipZeroes(G);
-      delete next_weight;
+      delete next_weight; */
       break;
     }
@@ -5348 +5374 @@
   rChangeCurrRing(XXRing);
   ideal result = idrMoveR(G,baseRing,currRing);
+  idDelete(&Go);
   idDelete(&G);
   //delete tmp_weight;
@@ -5376 +5403 @@
   Set_Error(FALSE);
   Overflow_Error = FALSE;
-  BOOLEAN endwalks = FALSE;
+  //BOOLEAN endwalks = FALSE;
 #ifdef TIME_TEST
   clock_t tinput, tostd, tif=0, tstd=0, tlift=0, tred=0, tnw=0;
@@ -5389 +5416 @@
   ideal Gomega, M, F,FF, Gomega1, Gomega2, M1;
   ring newRing;
+  ring targetRing;
   ring baseRing = currRing;
   ring XXRing = currRing;
@@ -5422 +5450 @@
   to = clock();
 #endif
+
+  if(target_M->length() == nV)
+  {
+   // define the target ring
+    targetRing = VMrDefault(target_weight);
+  }
+  else
+  {
+    targetRing = VMatrDefault(target_M);
+  }
   if(orig_M->length() == nV)
   {
@@ -5445 +5483 @@
     to = clock();
 #endif
-//#ifdef CHECK_IDEAL_MWALK
-    if(printout > 2)
-    {
-      idString(G,"//** Mrwalk: G");
-    }
-//#endif
+
     Gomega = MwalkInitialForm(G, curr_weight); // compute an initial form ideal of <G> w.r.t. "curr_vector"
     //polylength = 1 if there is a polynomial in Gomega with at least 3 monomials and 0 otherwise
@@ -5464 +5497 @@
 //#endif
     // test whether target cone is reached
-    if(test_w_in_ConeCC(G,target_weight) == 1)
+/*    if(test_w_in_ConeCC(G,target_weight) == 1)
     {
       endwalks = TRUE;
-    }
+    }*/
     if(reduction == 0)
     {
-      //PrintS("\n//** Mrwalk: test middle of cone!\n");
+      
       FF = middleOfCone(G,Gomega);
-      //PrintS("\n//** Mrwalk: Test F!\n");
+      
       if(FF != NULL)
       {
@@ -5478 +5511 @@
         G = idCopy(FF);
         idDelete(&FF);
-        //PrintS("\n//** Mrwalk: FF nicht NULL! Compue next vector.\n");
+        
         goto NEXT_VECTOR;
       } 
@@ -5507 +5540 @@
      if(target_M->length() == nV)
      {
-       newRing = VMrRefine(curr_weight,target_weight); //define a new ring with ordering "(a(curr_weight),Wp(target_weight))"
+       newRing = VMrDefault(curr_weight); // define a new ring with ordering "(a(curr_weight),lp)
+       //newRing = VMrRefine(curr_weight,target_weight); //define a new ring with ordering "(a(curr_weight),Wp(target_weight))"
      }
      else
@@ -5575 +5609 @@
     }
 //#endif
+
+    rChangeCurrRing(targetRing);
+    G = idrMoveR(G,newRing,currRing);
+    // test whether target cone is reached
+    if(reduction !=0 && test_w_in_ConeCC(G,curr_weight) == 1)
+    {
+      baseRing = currRing;
+      break;
+    }
+
+    rChangeCurrRing(newRing);
+    G = idrMoveR(G,targetRing,currRing);
+    baseRing = currRing;
+
+
     NEXT_VECTOR:
 #ifdef TIME_TEST
@@ -5596 +5645 @@
     }
 //#endif
-    if(MivComp(next_weight, ivNull) == 1 || MivComp(target_weight,curr_weight) == 1 || endwalks == TRUE)
-    {
+    if(MivComp(next_weight, ivNull) == 1 || MivComp(target_weight,curr_weight) == 1)// || endwalks == TRUE)
+    {/*
 //#ifdef CHECK_IDEAL_MWALK
       if(printout > 0)
@@ -5655 +5704 @@
       to = clock();
 #endif
-      /*PrintS("\n //**Mrwalk: Interreduce");
+      //PrintS("\n //**Mrwalk: Interreduce");
       //interreduce the Groebner basis <G> w.r.t. currRing
-      G = kInterRedCC(G,NULL);*/
+      //G = kInterRedCC(G,NULL);
 #ifdef TIME_TEST
       tred = tred + clock() - to;
 #endif
       idSkipZeroes(G);
-      delete next_weight;
+      delete next_weight;*/
       break;
     }
@@ -6724 +6773 @@
 {
   Overflow_Error =  FALSE;
-  //Print("\n\n// Entering the %d-th recursion:", nlev);
-
+  if(printout >0)
+  {
+    Print("\n\n// Entering the %d-th recursion:", nlev);
+  }
   int i, nV = currRing->N;
   ring new_ring, testring;
@@ -6793 +6844 @@
     // We only perturb the current target vector at the recursion level 1
     if(Xngleich == 0 && nlev == 1) //(ngleich == 0) important, e.g. ex2, ex3
-      if (MivComp(next_vect, omega2) != 1)
+      if (MivComp(next_vect, omega2) == 1)
       {
         // to dispense with taking initial (and lifting/interreducing
@@ -6848 +6899 @@
         to=clock();
 
-        /* to avoid the value of Overflow_Error that occur in Mfpertvector*/
+        // to avoid the value of Overflow_Error that occur in Mfpertvector
         Overflow_Error = FALSE;
-
         next_vect = MkInterRedNextWeight(omega,omega2,G);
         xtnw=xtnw+clock()-to;
@@ -6862 +6912 @@
 //#endif
 
-    /* check whether the the computed vector is in the correct cone */
-    /* If no, the reduced GB of an omega-homogeneous ideal will be
-       computed by Buchberger algorithm and stop this recursion step*/
-    //if(test_w_in_ConeCC(G, next_vect) != 1) //e.g. Example s7, cyc6
-    if(Overflow_Error == TRUE)
+    // check whether the the computed vector is in the correct cone.
+    // If no, compute the reduced Groebner basis of an omega-homogeneous
+    // ideal with Buchberger's algorithm and stop this recursion step
+    if(Overflow_Error == TRUE || test_w_in_ConeCC(G, next_vect) != 1)  //e.g. Example s7, cyc6
     {
       delete next_vect;
@@ -6886 +6935 @@
       if(printout > 0)
       {
-        Print("\n//** rec_fractal_call: Overflow. Applying Buchberger's algorithm in ring r = %s;",
+        Print("\n//** rec_fractal_call: Applying Buchberger's algorithm in ring r = %s;",
               rString(currRing));
       }
@@ -6905 +6954 @@
 
       nnflow ++;
-
       Overflow_Error = FALSE;
       return (G1);
-    }//end overflow-check
+    }
 
 
@@ -6951 +6999 @@
         if(printout > 0)
         {
-          Print("\n//** rec_fractal_call: Wrong cone. Tau' doesn't stay in the correct cone.\n");
+          Print("\n//** rec_fractal_call: Wrong cone. Tau doesn't stay in the correct cone.\n");
         }
-/*
+
 #ifndef  MSTDCC_FRACTAL
         intvec* Xtautmp;
@@ -6990 +7038 @@
         goto NEXT_VECTOR_FRACTAL;
 #endif
-*/
+
       FRACTAL_MSTDCC:
         if(printout > 0)
@@ -7063 +7111 @@
 
     to=clock();
-    /* Take the initial form of <G> w.r.t. omega */
+    // Take the initial form of <G> w.r.t. omega
     Gomega = MwalkInitialForm(G, omega);
     xtif=xtif+clock()-to;
@@ -7073 +7121 @@
     if(reduction == 0)
     {
-      /* Check whether the intermediate weight vector lies in the interior of the cone.
-       * If so, only perform reductions. Otherwise apply Buchberger's algorithm. */
+      // Check whether the intermediate weight vector lies in the interior of the cone.
+      // If so, only perform reductions. Otherwise apply Buchberger's algorithm.
       FF = middleOfCone(G,Gomega);
       if( FF != NULL)
@@ -7081 +7129 @@
         G = idCopy(FF);
         idDelete(&FF);
-        /* Compue next vector. */
+        // Compue next vector. 
         goto NEXT_VECTOR_FRACTAL;
       } 
@@ -7158 +7206 @@
     G = idrMoveR(F,oRing,currRing);
     to=clock();
-    /* Interreduce G */
-   // G = kInterRedCC(F1, NULL);
+    // Interreduce G
+    // G = kInterRedCC(F1, NULL);
     xtred=xtred+clock()-to;
     //idDelete(&F1);
@@ -7239 +7287 @@
     if(polylength > 0 && G->m[0] != NULL)
     {
-      /*
-      there is a polynomial in Gomega with at least 3 monomials,
-      low-dimensional facet of the cone
-      */
+      
+      PrintS("\n**// rec_r_fractal_call: there is a polynomial in Gomega with at least 3 monomials, low-dimensional facet of the cone.\n");
+      
       delete next_vect;
       next_vect = MWalkRandomNextWeight(G,omega,omega2,weight_rad,nlev);
@@ -7324 +7371 @@
         if(G->m[0] != NULL && polylength > 0)
         {
-          /*
-          there is a polynomial in Gomega with at least 3 monomials,
-          low-dimensional facet of the cone
-          */
+          
+          PrintS("//** rec_r_fractal_call: there is a polynomial in Gomega with at least 3 monomials, low-dimensional facet of the cone");
+          
           delete next_vect;
           next_vect = MWalkRandomNextWeight(G,omega,omega2,weight_rad,nlev);
@@ -7349 +7395 @@
        computed by Buchberger algorithm and stop this recursion step*/
     //if(test_w_in_ConeCC(G, next_vect) != 1) //e.g. Example s7, cyc6
-    if(Overflow_Error == TRUE)
+    if(Overflow_Error == TRUE || test_w_in_ConeCC(G,next_vect) != 1)
     {
       delete next_vect;

Tst/Manual/breakpoint.res.gz.uu

@@ -1 +1 @@
 begin 640 breakpoint.res.gz
-M'XL("(4YR5,``V)R96%K<&]I;G0N<F5S`'7000N"0!`%X+N_XB$=5C!),Q.$
-M/407(;K8/12'6)(UW(GZ^:U1IF"G7?;-^V"G..WS(X!0XI#OX++AH%&5F\'>
-MSDHK%E[F]">D1-51>;VU2G.@Z1$8+MDI/D(TCL6E:ZG2U-GR[Q6ACY+1*$U(
-MXQ1*XSLW,.M9QD>X3:96]+-L-FO%?ZQE.*',N(R:&F*JQ>J9>(.TD>]]]!^^
-.&V'K"^<%^NY1DCH!````
+M'XL("$+R=E4``V)R96%K<&]I;G0N<F5S`'7000N"0!`%X+N_XB$=5C!IM4P0
+M/$07(;K8/12'6)(UW(GZ^:U1IF"G7?;-^V"G..WS(P"9X9#OX++AH%&5F\+>
+MSDHK%E[J]">R#%5'Y?76*LV!ID=@N&2G^`CA.!:7KJ5*4V?+OU=('R6C49J0
+M1`F4QG=N8*)9QH?<QE,K_%DVF[76?ZREG%!F7$9-#3'58O6,O4':9.]]]!^^
+.&V'K"^<%/$@GQSH!````
 `
 end

libpolys/polys/clapconv.cc

@@ -297 +297 @@
 
     // test if denominator is constant
-    if (!p_IsConstantPoly(DEN (p_GetCoeff (p,r)),r->cf->extRing) && !errorreported)
+    if (!p_IsConstantPoly(DEN ((fraction)p_GetCoeff (p,r)),r->cf->extRing) && !errorreported)
       WerrorS("conversion error: denominator!= 1");
 
-    CanonicalForm term=convSingPFactoryP(NUM (p_GetCoeff(p, r)),r->cf->extRing);
+    CanonicalForm term=convSingPFactoryP(NUM ((fraction)p_GetCoeff(p, r)),r->cf->extRing);
 
     // if denominator is not NULL it should be a constant at this point
-    if (DEN (p_GetCoeff(p,r)) != NULL)
-    {
-      CanonicalForm den= convSingPFactoryP(DEN (p_GetCoeff(p, r)),r->cf->extRing);
+    if (DEN ((fraction)p_GetCoeff(p,r)) != NULL)
+    {
+      CanonicalForm den= convSingPFactoryP(DEN ((fraction)p_GetCoeff(p, r)),r->cf->extRing);
       if (rChar (r) == 0)
         On (SW_RATIONAL);

libpolys/polys/ext_fields/transext.cc

@@ -1455 +1455 @@
     //PrintS(" den=");p_wrp(DEN(a),ntRing);PrintLn();
     definiteGcdCancellation(a, cf, FALSE);
-    if ((DEN(a)!=NULL)
-    &&(!n_GreaterZero(pGetCoeff(DEN(a)),ntCoeffs)))
-    {
-      NUM(a)=p_Neg(NUM(a),ntRing);
-      DEN(a)=p_Neg(DEN(a),ntRing);
+    fraction f=(fraction)a;
+    if ((DEN(f)!=NULL)
+    &&(!n_GreaterZero(pGetCoeff(DEN(f)),ntCoeffs)))
+    {
+      NUM(f)=p_Neg(NUM(f),ntRing);
+      DEN(f)=p_Neg(DEN(f),ntRing);
+      a=(number)f;
     }
   }
@@ -2320 +2322 @@
     }
 
-    NUM(c) = p_Mult_nn(NUM(c), d, R);
+    NUM((fraction)c) = p_Mult_nn(NUM((fraction)c), d, R);
     n_Delete(&d, Q);
   }

libpolys/polys/ext_fields/transext.h

@@ -73 +73 @@
 
 
-#define NUM(f) (((fraction)f)->numerator)
-#define DEN(f) (((fraction)f)->denominator)
+#define NUM(f) ((f)->numerator)
+#define DEN(f) ((f)->denominator)
 
 /* some useful accessors for fractions: */

libpolys/polys/monomials/p_polys.cc

@@ -3841 +3841 @@
     assume( !IS0(z) );
 
-    zz = NUM(z);
+    zz = NUM((fraction)z);
     p_Test (zz, srcExtRing);
 
     if( zz == NULL ) return NULL;
-    if( !DENIS1(z) )
-    {
-      if (p_IsConstant(DEN(z),srcExtRing))
-      {
-        number n=pGetCoeff(DEN(z));
+    if( !DENIS1((fraction)z) )
+    {
+      if (p_IsConstant(DEN((fraction)z),srcExtRing))
+      {
+        number n=pGetCoeff(DEN((fraction)z));
         zz=p_Div_nn(zz,n,srcExtRing);
         p_Normalize(zz,srcExtRing);
@@ -4011 +4011 @@
                  pcn = (poly) c;
                else //            nCoeff_is_transExt(C)
-                 pcn = NUM(c);
+                 pcn = NUM((fraction)c);
 
               if (pNext(pcn) == NULL) // c->z

m4/mathic-check.m4

@@ -14 +14 @@
  dnl Checking these pre-requisites and adding them to libs is necessary
  dnl for some reason, at least on Cygwin.
+ BACKUP_LIBS=${LIBS}
  AS_IF( [test "x$with_mathicgb" = xyes],
  [
@@ -25 +26 @@
   AC_CHECK_HEADER([mathicgb.h])
   AC_LANG_POP([C++])
+  MATHIC_LIBS=${LIBS}
+  LIBS=${BACKUP_LIBS}
+  AC_SUBST(MATHIC_LIBS)
   AC_DEFINE(HAVE_MATHICGB,1,[Define if mathicgb is to be used])
 #  AC_SUBST(HAVE_MATHICGB_VALUE, 1)

resources/omFindExec.c

@@ -126 +126 @@
         strcat (tbuf, name);
 
-        /* If we can execute the named file, then return it. */
-        if (! access (tbuf, X_OK))
+        /* If the named file exists, then return it. */
+        if (! access (tbuf, F_OK))
         {
 #ifdef WINNT