Changeset dc42daf in git

Timestamp:

Feb 21, 2013, 7:13:50 PM (11 years ago)

Author:

Claus Fieker <fieker@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

5693d74c7e74fb28bc22148699aebb6524ded48c

Parents:

892dd80edda39f846824ca997ef834ad6d19f748

git-author:

Claus Fieker <fieker@erbsenstein.(none)>2013-02-21 19:13:50+01:00

git-committer:

Claus Fieker <fieker@erbsenstein.(none)>2013-02-22 16:40:29+01:00

Message:

an attempt to introduce better normalization for polynomials over number fields. Seems to work well in selected examples...

Files:

• kernel/kInline.h (modified) (1 diff)
• libpolys/polys/ext_fields/algext.cc (modified) (6 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (4 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)

kernel/kInline.h

@@ -456 +456 @@
     {
       if (t_p != NULL)
-        {
-          p_Cleardenom(t_p, tailRing);
-          pSetCoeff0(p, pGetCoeff(t_p));
-        }
+        {
+          p_ProjectiveUnique(t_p, tailRing);
+          pSetCoeff0(p, pGetCoeff(t_p));
+        }
       else
-        {
-          p_Cleardenom(p, currRing);
-        }
+        {
+#ifdef HAVE_RATGRING
+          p_ProjectiveUnique(p, currRing);
+#else
+          p_ProjectiveUnique(p, currRing);
+#endif
+        }
     }
 }

libpolys/polys/ext_fields/algext.cc

@@ -220 +220 @@
 }
 
+
 /* assumes that p and q are univariate polynomials in r,
    mentioning the same variable;
@@ -505 +506 @@
   poly aTimesB = p_Mult_q(p_Copy((poly)a, naRing),
                           p_Copy((poly)b, naRing), naRing);
+  definiteReduce(aTimesB, naMinpoly, cf);
   p_Normalize(aTimesB,naRing);
-  definiteReduce(aTimesB, naMinpoly, cf);
   return (number)aTimesB;
 }
@@ -520 +521 @@
     poly aDivB = p_Mult_q(p_Copy((poly)a, naRing), bInverse, naRing);
     definiteReduce(aDivB, naMinpoly, cf);
+    p_Normalize(aDivB,naRing);
     return (number)aDivB;
   }
@@ -682 +684 @@
     pIter(bb);
   }
+  return h;
 }
 number naLcmContent(number a, number b, const coeffs cf)
 {
   if (nCoeff_is_Zp(naRing->cf)) return naCopy(a,cf);
-  else return ndGcd(a,b,cf);
-  #if 0
+#if 0
+  else {
+    number g = ndGcd(a, b, cf);
+    return g;
+  }
+#else
   {
     a=(number)p_Copy((poly)a,naRing);
     number t=napLcm(b,cf);
-    if(!naIsOne(t,cf))
+    if(!n_IsOne(t,naRing->cf))
     {
       number bt, rr;
@@ -710 +717 @@
     return (number) a;
   }
-  #endif
+#endif
 }
 
@@ -1195 +1202 @@
 
   }
+
 
   // part3: all coeffs = all coeffs / cand

libpolys/polys/monomials/p_polys.cc

@@ -2495 +2495 @@
   if(pNext(p)==NULL)
   {
+    /*
     if (TEST_OPT_CONTENTSB)
     {
@@ -2507 +2508 @@
     }
     else
+    */
       p_SetCoeff(p,n_Init(1,r->cf),r);
 
@@ -2517 +2519 @@
   assume(pNext(p)!=NULL);
 
-#if CLEARENUMERATORS
+#if 0 && CLEARENUMERATORS
+//CF: does not seem to work that well..
+  
   if( nCoeff_is_Q(C) || nCoeff_is_Q_a(C) )
   {
@@ -2809 +2813 @@
 }
 
+  // normalization: for poly over Q: make poly primitive, integral
+  //                              Qa make poly integral with leading
+  //                                  coefficient minimal in N
+  //                            Q(t) make poly primitive, integral
+
+void p_ProjectiveUnique(poly ph, const ring r)
+{
+  if( ph == NULL )
+    return;
+
+  assume( r != NULL ); assume( r->cf != NULL ); const coeffs C = r->cf;
+
+  poly start=ph;
+
+  number d, h;
+  poly p;
+
+#ifdef HAVE_RINGS
+  if (rField_is_Ring(r))
+  {
+    p_Content(ph,r);
+    assume( n_GreaterZero(pGetCoeff(ph),C) );
+    if(!n_GreaterZero(pGetCoeff(ph),C)) ph = p_Neg(ph,r);
+    return;
+  }
+#endif
+
+  if (rField_is_Zp(r) && TEST_OPT_INTSTRATEGY)
+  {
+    assume( n_GreaterZero(pGetCoeff(ph),C) );
+    if(!n_GreaterZero(pGetCoeff(ph),C)) ph = p_Neg(ph,r);
+    return; 
+  }
+  p = ph;
+
+  assume(p != NULL);
+
+  if(pNext(p)==NULL) // a monomial
+  {
+    p_SetCoeff(p, n_Init(1, C), r);
+    return;
+  }
+
+  assume(pNext(p)!=NULL);
+
+  if(1)
+  {
+    h = p_GetCoeff(p, C);
+    number hInv = n_Invers(h, C);
+    pIter(p);
+    while (p!=NULL)
+    {
+      p_SetCoeff(p, n_Mult(p_GetCoeff(p, C), hInv, C), r);
+      pIter(p);
+    }
+    n_Delete(&hInv, C);
+    p = ph;
+    p_SetCoeff(p, n_Init(1, C), r);
+  }
+  p_Cleardenom(ph, r);
+  p_Content(ph, r);
+  return;
+}
+
 number p_GetAllDenom(poly ph, const ring r)
 {

libpolys/polys/monomials/p_polys.h

@@ -203 +203 @@
 void      p_Norm(poly p1, const ring r);
 void      p_Normalize(poly p,const ring r);
+void      p_ProjectiveUnique(poly p,const ring r);
 
 void      p_Content(poly p, const ring r);