Changeset ec2602 in git

Timestamp:

Nov 24, 2011, 5:20:29 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f831299ca8780b0484e5c97ab9ebc7b3a4b85e0a

Parents:

d3bf01540e1d6181e4e04912c9334dac07c29b47a43cca5ec664cb599240d68933581729ed0c9d9a

Message:

Merge pull request #20 from mmklee/factory_without_ntl

error messages for factorization without NTL
NOTE: factoryError = WerrorS (set via Singular main) and thus error messages are printed with "WerrorS", which also _supposed_ to set an error status in the Interpreter... which does NOT seem to happen!

Files:

• .gitignore (modified) (2 diffs)
• Singular/extra.cc (modified) (6 diffs)
• Singular/walk.cc (modified) (8 diffs)
• factory/cf_factor.cc (modified) (5 diffs)
• kernel/fegetopt.h (modified) (1 diff)
• libpolys/polys/ext_fields/algext.cc (modified) (2 diffs)
• libpolys/polys/ext_fields/transext.cc (modified) (2 diffs)

.gitignore

@@ -11 +11 @@
 doc/
 MOD
+libsingular-config
 factory/readcf.cc
 factory/ylwrap
@@ -87 +88 @@
 omalloc/omExternalConfig.h
 omalloc/omlimits.h
+omalloc/omConfig.h.in
 doc/NTL
 factory/factory.h

Singular/extra.cc

@@ -984 +984 @@
   Werror("Sorry: not yet re-factored: see libpolys/polys/clapsing.cc");
   return FALSE;
-#else    
-        if ((h!=NULL) &&(h->Typ()==IDEAL_CMD))
+#else
+        if ((h!=NULL) &&(h->Typ()==IDEAL_CMD))
         {
           res->rtyp=STRING_CMD;
@@ -993 +993 @@
         else
           WerrorS("ideal expected");
-#endif  
+#endif
       }
       else
@@ -2409 +2409 @@
           p_DebugPrint((poly)h->Data(), currRing);
 #  else
-          Warn("Sorry: not available for release build!");
+          Warn("Sorry: not available for release build!");
 #  endif
           return FALSE;
@@ -2420 +2420 @@
           rDebugPrint((ring)h->Data());
 #  else
-          Warn("Sorry: not available for release build!");
+          Warn("Sorry: not available for release build!");
 #  endif
           return FALSE;
@@ -3766 +3766 @@
         extern int fanID;
         res->rtyp=fanID;
-        res->data=(void*)(grfan(I,heuristic,FALSE));
+        res->data=(void*)(grfan(I,heuristic,FALSE));
       #endif
       return FALSE;
@@ -3789 +3789 @@
   else
 #endif
-    if (strcmp(sys_cmd,"denom_list")==0)
-      {
-        res->rtyp=LIST_CMD;
-        extern lists get_denom_list();
-        res->data=(lists)get_denom_list();
-        return FALSE;
-      }
+  if (strcmp(sys_cmd,"denom_list")==0)
+  {
+    res->rtyp=LIST_CMD;
+    extern lists get_denom_list();
+    res->data=(lists)get_denom_list();
+    return FALSE;
+  }
+  else
 /*==================== Error =================*/
       Werror( "(extended) system(\"%s\",...) %s", sys_cmd, feNotImplemented );

Singular/walk.cc

@@ -31 +31 @@
 
 //#define TIME_TEST // print the used time of each subroutine
-//#define ENDWALKS //print the size of the last omega-homogenoues Gröbner basis
+//#define ENDWALKS //print the size of the last omega-homogenoues Grï¿œbner basis
 
 /* includes */
@@ -1815 +1815 @@
   int i, nv = currRing->N;
 
-  r->cf->ch  = rChar (currRing);
+  r->cf  = currRing->cf;
   r->N   = currRing->N;
   int nb = rBlocks(currRing) + 1;//31.10.01 (+1)
@@ -1886 +1886 @@
   int i, nv = currRing->N;
 
-  r->cf->ch  = rChar (currRing);
+  r->cf  = currRing->cf;
   r->N   = currRing->N;
   int nb = rBlocks(currRing) + 1;//31.10.01 (+1)
@@ -2035 +2035 @@
 
 
-  r->cf->ch  = rChar (currRing);
+  r->cf  = currRing->cf;
   r->N   = currRing->N;
   int nb = rBlocks(currRing) + 1;//31.10.01 (+1)
@@ -3272 +3272 @@
 
 /* The main procedur Mfwalk calls the recursive Subroutine
-   rec_fractal_call to compute the wanted Gröbner basis.
-   At the main procedur we compute the reduced Gröbner basis w.r.t. a "fast"
+   rec_fractal_call to compute the wanted Grï¿œbner basis.
+   At the main procedur we compute the reduced Grï¿œbner basis w.r.t. a "fast"
    order, e.g. "dp" and a sequence of weight vectors which are row vectors
    of a matrix. This matrix defines the given monomial order, e.g. "lp"
@@ -3561 +3561 @@
 
 /* 08.09.02 */
-/******** THE NEW GRÖBNER WALK ALGORITHM **********/
-/* Gröbnerwalk with a recursive "second" alternative GW, REC_GB_Mwalk
+/******** THE NEW GRï¿œBNER WALK ALGORITHM **********/
+/* Grï¿œbnerwalk with a recursive "second" alternative GW, REC_GB_Mwalk
    that only computes the last reduced GB */
 ideal Mwalk(ideal Go, intvec* curr_weight, intvec* target_weight)
@@ -3620 +3620 @@
       tim = clock();
       /*
-        Print("\n// **** Gröbnerwalk took %d steps and ", nwalk);
+        Print("\n// **** Grï¿œbnerwalk took %d steps and ", nwalk);
         PrintS("\n// **** call the rec. Pert. Walk to compute a red GB of:");
         idElements(Gomega, "G_omega");
@@ -5130 +5130 @@
 
 
-/* compute the reduced Gröbner basis of an ideal <Go> w.r.t. lp */
+/* compute the reduced Grï¿œbner basis of an ideal <Go> w.r.t. lp */
 static ideal Mpwalk_MAltwalk1(ideal Go, intvec* curr_weight, int tp_deg)
 {

factory/cf_factor.cc

@@ -31 +31 @@
 #include "facFactorize.h"
 #include "singext.h"
+#include "cf_util.h"
 
 #include "int_int.h"
@@ -563 +564 @@
       #else
       ASSERT( f.isUnivariate(), "multivariate factorization not implemented" );
+      factoryError ("multivariate factorization not implemented");
+      return CFFList (CFFactor (f, 1));
       #endif
     }
@@ -615 +618 @@
         //printf("fac.:\n");out_cff(F);
       }
-      else
+      #else
+      {
+        //Use Factory without NTL
+        //F = ZFactorizeUnivariate( fz, issqrfree );
+        factoryError ("univariate factorization over Z not implemented"); 
+        return CFFList (CFFactor (f, 1));
+      }
       #endif
-      {
-        //Use Factory without NTL
-        F = ZFactorizeUnivariate( fz, issqrfree );
-      }
-    }
-    else
-    {
+    }
+    else
+    {
+      #ifdef HAVE_NTL
       F = ZFactorizeMultivariate( fz, issqrfree );
+      #else
+      factoryError ("multivariate factorization not implemented");
+      return CFFList (CFFactor (f, 1));
+      #endif
     }
 
@@ -796 +806 @@
     #else
     ASSERT( f.isUnivariate(), "multivariate factorization not implemented" );
+    factoryError ("multivariate factorization not implemented");
+    return CFFList (CFFactor (f, 1));
     #endif
 
@@ -809 +821 @@
 #else
     ASSERT( f.isUnivariate(), "multivariate factorization not implemented" );
+    factoryError ("multivariate factorization not implemented");
+    return CFFList (CFFactor (f, 1));
 #endif
   }

kernel/fegetopt.h

@@ -88 +88 @@
   int val;
   /* Stuff added for Singular  */
-  const char*   arg_name;// name of argument, for display in help
-  const char*   help;    // (short) help string
-  feOptType     type;    // type of argument, if has_arg > 0
-  void*         value;   // (default) value of option
-  int           set;     // only relevant for strings: 0 if not set, 1 if set
+  const char*   arg_name;/* name of argument, for display in help */
+  const char*   help;    /* (short) help string */
+  feOptType     type;    /* type of argument, if has_arg > 0 */
+  void*         value;   /* (default) value of option */
+  int           set;     /* only relevant for strings: 0 if not set, 1 if set */
 };
 

libpolys/polys/ext_fields/algext.cc

@@ -113 +113 @@
   if (a == NULL) return TRUE;
   p_Test((poly)a, naRing);
-  assume(p_Totaldegree((poly)a, naRing) <= p_Totaldegree(naMinpoly, naRing));
+  if(p_Totaldegree((poly)a, naRing) >= p_Totaldegree(naMinpoly, naRing))
+  {
+    Print("deg >= deg(minpoly) in %s:%d\n",f,l);
+    return FALSE;
+  }
   return TRUE;
 }
@@ -486 +490 @@
   poly aAsPoly;
   const char * result = p_Read(s, aAsPoly, naRing);
+  definiteReduce(aAsPoly, naMinpoly, cf);
   *a = (number)aAsPoly;
   return result;

libpolys/polys/ext_fields/transext.cc

@@ -138 +138 @@
   assume(NUM(t) != NULL);   /**< t != 0 ==> numerator(t) != 0 */
   p_Test(NUM(t), ntRing);
-  if (!DENIS1(t)) p_Test(DEN(t), ntRing);
+  if (!DENIS1(t)) 
+  {
+    p_Test(DEN(t), ntRing);
+    if(p_IsConstant(DEN(t),ntRing) && (n_IsOne(pGetCoeff(DEN(t)),ntRing->cf)))
+    {
+      Print("?/1 in %s:%d\n",f,l);
+       return FALSE;
+    }
+  }
   return TRUE;
 }
@@ -561 +569 @@
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(result) = g;
-  DEN(result) = f;
+  if (!p_IsConstant(f,ntRing) || !n_IsOne(pGetCoeff(f),ntRing->cf))
+    DEN(result) = f;
   COM(result) = COM(fa) + COM(fb) + MULT_COMPLEXITY;
   heuristicGcdCancellation((number)result, cf);