Changeset d50995 in git

Timestamp:

Dec 4, 2014, 12:59:58 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

3bd01abee2945bbd1dd350c68e4ab321a9256c9e

Parents:

009bd5cbba879731a3b0eb480677ac1996111115

Message:

warnings: fixed finvar.lib, rModifyRing, wrong assume in gnumpc.cc

Files:

• Singular/LIB/finvar.lib (modified) (4 diffs)
• libpolys/coeffs/gnumpc.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)

Singular/LIB/finvar.lib

@@ -1490 +1490 @@
     string mp=string(minpoly);
     execute("ring R=("+charstr(br)+"),("+varstr(br)+"),ds;");
-    execute("minpoly=number("+mp+");");
+    if (mp!="0")
+    {
+      execute("minpoly=number("+mp+");");
+    }
     poly A(1)=0;                      // A(1) will contain the sum of n terms -
     poly min;                         // min will be our smallest term -
@@ -7626 +7629 @@
     string mp=string(minpoly);
     execute("ring R=("+charstr(br)+"),("+varstr(br)+",y(1..m)),dp;");
-    execute("minpoly=number("+mp+");");
+    if (mp!="0")
+    { execute("minpoly=number("+mp+");"); }
     ideal I=ideal(imap(br,F));
     for (int i=1;i<=m;i++)
-    { I[i]=I[i]-y(i);
-    }
+    { I[i]=I[i]-y(i); }
     I=elim(I,1..n);
     execute("ring "+newring+"=("+charstr(br)+"),(y(1..m)),dp(m);");
-    execute("minpoly=number("+mp+");");
+    if (mp!="0")
+    { execute("minpoly=number("+mp+");"); }
     ideal vars;
     for (i=2;i<=n;i++)
@@ -7855 +7859 @@
     string mp=string(minpoly);
     execute("ring R=("+charstr(br)+"),("+varstr(br)+",y(1..m)),lp;");
-    execute("minpoly=number("+mp+");");
+    if (mp!="0")
+    { execute("minpoly=number("+mp+");"); }
     ideal J=ideal(imap(br,F));
     ideal I=imap(br,I);
@@ -7881 +7886 @@
     G=compress(G);
     execute("ring "+newring+"=("+charstr(br)+"),(y(1..m)),lp;");
-    execute("minpoly=number("+mp+");");
+    if (mp!="0")
+    { execute("minpoly=number("+mp+");"); }
     ideal vars;
     for (i=2;i<=n;i++)

libpolys/coeffs/gnumpc.cc

@@ -601 +601 @@
   }
 
-  assume( n->float_len <= n->float_len2 );
   assume( pParameterNames != NULL );
   assume( pParameterNames[0] != NULL );

libpolys/polys/monomials/ring.cc

@@ -2670 +2670 @@
         if (try_omit_comp)
         {
-#ifndef SING_NDEBUG
-          Warn("WRONG USAGE? of rModifyRing: omitting component due to the ordering block [%d]: %d (ringorder_s)", i, r_ord);
-#endif
+          // tried, but cannot omit component due to the ordering block [%d]: %d (ringorder_s)", i, r_ord
           try_omit_comp = FALSE;
         }