Changeset 4132ee in git

Timestamp:

Jul 23, 2015, 11:09:40 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

47362dcbb6b4fbb3b9d6cded63720e333b4c97b3654a230847a8318a2a297f1520550f19f34a440165d72f770834146c47c12f86f49af7f3c8cef09d6a52f15f9780f7af3a0ea06d03b4376f61136261

Parents:

0017fdba19465a475d4ccb4e08333f7d3b95d393

Message:

fix: tr. #714 (wp,wp is not a weighted ordering, but a block ordering)

Files:

• Singular/LIB/primdec.lib (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (5 diffs)

Singular/LIB/primdec.lib

@@ -3413 +3413 @@
 
   ideal jkeep=@j;
-  if(ordstr(@P)[1]=="w")
+  if((ordstr(@P)[1]=="w")&&(size(ringlist(@P)[3])==2)) // weighted ordering
   {
     list gnir_l=ringlist(gnir);

libpolys/polys/ext_fields/transext.cc

@@ -230 +230 @@
     }
 
-    poly gcd = singclap_gcd_r( num, den, ntRing );
-
-    if( !p_IsOne(gcd, ntRing) )
-    {
-      Print("ERROR in %s:%d: 1 != GCD between num. & den. poly\n",f,l);
-      Print("GCD: ");  p_Write(gcd, ntRing);
-      Print("NUM: ");  p_Write(num, ntRing);
-      Print("DEN: ");  p_Write(den, ntRing);
-      return FALSE;
-    }
-
-    p_Delete( &gcd, ntRing );
-
+    if (COM(t)==0)
+    {
+      poly gcd = singclap_gcd_r( num, den, ntRing );
+      if( !p_IsOne(gcd, ntRing) )
+      {
+        Print("ERROR in %s:%d: 1 != GCD between num. & den. poly\n",f,l);
+        Print("GCD: ");  p_Write(gcd, ntRing);
+        Print("NUM: ");  p_Write(num, ntRing);
+        Print("DEN: ");  p_Write(den, ntRing);
+        return FALSE;
+      }
+      p_Delete( &gcd, ntRing );
+    }
     return TRUE;
 
@@ -1313 +1313 @@
               pIter(h);
             } while(h!=NULL);
-            p_ExpVectorDiff(den_f,den_f,den_f,ntRing);
+            p_ExpVectorDiff(den_f,den_f,den_f,ntRing);
             break;
           }
@@ -1435 +1435 @@
        to be != 1. */
     if (p_IsConstant(DEN(f), ntRing) &&
-        n_IsOne(p_GetCoeff(DEN(f), ntRing), ntCoeffs))
+      n_IsOne(p_GetCoeff(DEN(f), ntRing), ntCoeffs))
     {
       /* DEN(f) = 1 needs to be represented by NULL! */
@@ -1458 +1458 @@
     }
   }
+  p_Delete(&pGcd, ntRing);
   COM(f) = 0;
-  p_Delete(&pGcd, ntRing);
 
   if( DEN(f) != NULL )
+  {
     if( !n_GreaterZero(pGetCoeff(DEN(f)), ntCoeffs) )
     {
@@ -1474 +1475 @@
       }
     }
+  }
   ntTest(a); // !!!!
 }