Changeset e5c9e5 in git for libpolys/polys/ext_fields/transext.cc

Timestamp:

Mar 5, 2013, 4:43:58 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

803cb2d20d4037b513adf020767d48f6893fc9a2

Parents:

161e20729b9213f0aaa51ebeacdbd63260916ff6

Message:

fix: normalization for trans. ext.

File:

• libpolys/polys/ext_fields/transext.cc (modified) (13 diffs)

libpolys/polys/ext_fields/transext.cc

@@ -152 +152 @@
     assume( _p_Test(den, ntRing,1) );
 
-    if(p_IsConstant(den, ntRing) && (n_IsOne(pGetCoeff(den), ntRing->cf)))
+    if(p_IsConstant(den, ntRing) && (n_IsOne(pGetCoeff(den), ntCoeffs)))
     {
       Print("?/1 in %s:%d\n",f,l);
@@ -158 +158 @@
     }
 
-    if( !n_GreaterZero(pGetCoeff(den), ntRing->cf) )
+    if( !n_GreaterZero(pGetCoeff(den), ntCoeffs) )
     {
       Print("negative sign of DEN. of a fraction in %s:%d\n",f,l);
@@ -300 +300 @@
 
 
-    n_ClearDenominators(itr, g, ntRing->cf);
-
-    if( !n_GreaterZero(g, ntRing->cf) )
+    n_ClearDenominators(itr, g, ntCoeffs);
+
+    if( !n_GreaterZero(g, ntCoeffs) )
     {
       NUM (f) = p_Neg(NUM (f), ntRing); // Ugly :(((
-      g = n_Neg(g, ntRing->cf);
+      g = n_Neg(g, ntCoeffs);
     }
 
     // g should be a positive integer now!
-    assume( n_GreaterZero(g, ntRing->cf) );
-
-    if( !n_IsOne(g, ntRing->cf) )
+    assume( n_GreaterZero(g, ntCoeffs) );
+
+    if( !n_IsOne(g, ntCoeffs) )
     {
       DEN (f) = p_NSet(g, ntRing); // update COM(f)???
@@ -318 +318 @@
     }
     else
-      n_Delete(&g, ntRing->cf);
+      n_Delete(&g, ntCoeffs);
 
     ntTest(a);
@@ -386 +386 @@
   CPolyCoeffsEnumerator itr(NUM(f));
 
-  n_ClearDenominators(itr, g, ntRing->cf); // may return -1 :(((
-
-  if( !n_GreaterZero(g, ntRing->cf) )
+  n_ClearDenominators(itr, g, ntCoeffs); // may return -1 :(((
+
+  if( !n_GreaterZero(g, ntCoeffs) )
   {
 //     NUM (f) = p_Neg(NUM (f), ntRing); // Ugly :(((
-//     g = n_Neg(g, ntRing->cf);
+//     g = n_Neg(g, ntCoeffs);
     NUM (f) = p_Neg(NUM (f), ntRing); // Ugly :(((
-    g = n_Neg(g, ntRing->cf);
+    g = n_Neg(g, ntCoeffs);
   }
 
   // g should be a positive integer now!
-  assume( n_GreaterZero(g, ntRing->cf) );
-
-  if( !n_IsOne(g, ntRing->cf) )
-  {
-    assume( n_GreaterZero(g, ntRing->cf) );
-    assume( !n_IsOne(g, ntRing->cf) );
+  assume( n_GreaterZero(g, ntCoeffs) );
+
+  if( !n_IsOne(g, ntCoeffs) )
+  {
+    assume( n_GreaterZero(g, ntCoeffs) );
+    assume( !n_IsOne(g, ntCoeffs) );
 
     DEN (f) = p_NSet(g, ntRing); // update COM(f)???
@@ -413 +413 @@
   { // common denom == 1?
     NUM (result)= p_NSet(g, ntRing); // p_Copy (DEN (f), ntRing);
-//  n_Delete(&g, ntRing->cf);
+//  n_Delete(&g, ntCoeffs);
   }
 
@@ -419 +419 @@
 //    else
 //      g= p_GetAllDenom (num, ntRing);
-//    result= (fraction) ntSetMap (ntRing->cf, cf) (g, ntRing->cf, cf);
+//    result= (fraction) ntSetMap (ntCoeffs, cf) (g, ntCoeffs, cf);
 
   ntTest((number)result);
@@ -533 +533 @@
   if (p == NULL) return NULL;
 
+  fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
+
+  if (nCoeff_is_Q(ntCoeffs))
+  {
     number g;
     // TODO/NOTE: the following should not be necessary (due to
     // Hannes!) as NUM (f) should be over Z!!!
+    // but it is not: normalize it
     CPolyCoeffsEnumerator itr(p);
 
-    n_ClearDenominators(itr, g, ntRing->cf);
-
-    if( !n_GreaterZero(g, ntRing->cf) )
-    {
-      p = p_Neg(p, ntRing); // Ugly :(((
-      g = n_Neg(g, ntRing->cf);
+    n_ClearDenominators(itr, g, ntCoeffs);
+
+    if( !n_GreaterZero(g, ntCoeffs) )
+    {
+      p = p_Neg(p, ntRing);
+      g = n_Neg(g, ntCoeffs);
     }
 
     // g should be a positive integer now!
-    assume( n_GreaterZero(g, ntRing->cf) );
-
-    fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
-
-    if( !n_IsOne(g, ntRing->cf) )
+    assume( n_GreaterZero(g, ntCoeffs) );
+
+    if( !n_IsOne(g, ntCoeffs) )
     {
       DEN (f) = p_NSet(g, ntRing);
-//      COM (f) ++; // update COM(f)???
       assume( DEN (f) != NULL );
     }
     else
     {
-      DEN(f) = NULL;
-      n_Delete(&g, ntRing->cf);
-    }
-
-    NUM(f) = p;
-    COM(f) = 0;
-
-    ntTest((number)f);
-    return (number)f;
+      //DEN(f) = NULL; // done by omAlloc0
+      n_Delete(&g, ntCoeffs);
+    }
+  }
+
+  NUM(f) = p;
+  COM(f) = 0;
+
+  ntTest((number)f);
+  return (number)f;
 }
 
@@ -633 +636 @@
   number aa;
   number bb;
-  if (bDenCoeff==NULL) aa=n_Copy(aNumCoeff,ntRing->cf);
-  else                 aa=n_Mult(aNumCoeff,bDenCoeff,ntRing->cf);
-  if (aDenCoeff==NULL) bb=n_Copy(bNumCoeff,ntRing->cf);
-  else                 bb=n_Mult(bNumCoeff,aDenCoeff,ntRing->cf);
+  if (bDenCoeff==NULL) aa=n_Copy(aNumCoeff,ntCoeffs);
+  else                 aa=n_Mult(aNumCoeff,bDenCoeff,ntCoeffs);
+  if (aDenCoeff==NULL) bb=n_Copy(bNumCoeff,ntCoeffs);
+  else                 bb=n_Mult(bNumCoeff,aDenCoeff,ntCoeffs);
   BOOLEAN rr= n_Greater(aa, bb, ntCoeffs);
-  n_Delete(&aa,ntRing->cf);
-  n_Delete(&bb,ntRing->cf);
+  n_Delete(&aa,ntCoeffs);
+  n_Delete(&bb,ntCoeffs);
   return rr;
 }
@@ -849 +852 @@
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(result) = g;
-  if (!n_GreaterZero(pGetCoeff(f),ntRing->cf))
+  if (!n_GreaterZero(pGetCoeff(f),ntCoeffs))
   {
     g=p_Neg(g,ntRing);
@@ -855 +858 @@
     NUM(result) = g;
   }
-  if (!p_IsConstant(f,ntRing) || !n_IsOne(pGetCoeff(f),ntRing->cf))
+  if (!p_IsConstant(f,ntRing) || !n_IsOne(pGetCoeff(f),ntCoeffs))
   {
     DEN(result) = f;
@@ -1282 +1285 @@
     definiteGcdCancellation(a, cf, FALSE);
     if ((DEN(a)!=NULL)
-    &&(!n_GreaterZero(pGetCoeff(DEN(a)),ntRing->cf)))
+    &&(!n_GreaterZero(pGetCoeff(DEN(a)),ntCoeffs)))
     {
       NUM(a)=p_Neg(NUM(a),ntRing);
@@ -1450 +1453 @@
   {
     poly num_f=NUM(f);
-    BOOLEAN neg= !n_GreaterZero(pGetCoeff(num_f),ntRing->cf);
+    BOOLEAN neg= !n_GreaterZero(pGetCoeff(num_f),ntCoeffs);
     if (neg)
     {