Changeset fef045c in git

Timestamp:

Oct 10, 2009, 7:15:40 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

05998dae5a4237480bafa680febec202b19a3bf6

Parents:

259111f4634d94bbfd66d60c471984b56b91d4b2

Message:

*hannes: normalize stuff


git-svn-id: file:///usr/local/Singular/svn/trunk@12186 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/longalg.cc (modified) (18 diffs)

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.61 2009-10-10 10:44:37 Singular Exp $ */
+/* $Id: longalg.cc,v 1.62 2009-10-10 17:15:40 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -70 +70 @@
 #define napCopy(p)       p_Copy(p,nacRing)
 
-void naCoefNormalize(number pp);
-
 static number nadGcd( number a, number b, const ring r) { return nacInit(1,r); }
 /*2
@@ -197 +195 @@
 {
   number t;
-  poly pp=p;
 
   while (p!=NULL)
   {
     t = nacMult(pGetCoeff(p), z);
+    nacNormalize(t);
     n_Delete(&pGetCoeff(p),nacRing);
     pGetCoeff(p) = t;
     pIter(p);
   }
-  p_Normalize(pp,nacRing);
 }
 
@@ -227 +224 @@
     pGetCoeff(qq) = nacDiv(pGetCoeff(a), pGetCoeff(g));
     pGetCoeff(qq) = nacNeg(pGetCoeff(qq));
+    nacNormalize(pGetCoeff(qq));
     h = napCopy(g);
     napMultT(h, qq);
+    p_Normalize(h,nacRing);
     n_Delete(&pGetCoeff(qq),nacRing);
     a = napAdd(a, h);
@@ -259 +258 @@
     h = napCopy(g);
     napMultT(h, qq);
+    p_Normalize(h,nacRing);
     n_Delete(&pGetCoeff(qq),nacRing);
     a = napAdd(a, h);
@@ -286 +286 @@
     if (!nacIsOne(pGetCoeff(x)))
     {
+      nacNormalize(pGetCoeff(x));
       t = nacInvers(pGetCoeff(x));
       nacNormalize(t);
@@ -301 +302 @@
   if (p_GetExp(r,1,nacRing)==0)
   {
+    nacNormalize(pGetCoeff(r));
     t = nacInvers(pGetCoeff(r));
+    nacNormalize(t);
     t = nacNeg(t);
     napMultN(qa, t);
     n_Delete(&t,nacRing);
+    p_Normalize(qa,nacRing);
     p_Delete(&x,nacRing);
     p_Delete(&r,nacRing);
@@ -320 +324 @@
     q = p_Mult_q(q, qa,nacRing);
     q = napAdd(q, p_ISet(1,nacRing));
+    nacNormalize(pGetCoeff(r));
     t = nacInvers(pGetCoeff(r));
     napMultN(q, t);
+    p_Normalize(q,nacRing);
     n_Delete(&t,nacRing);
     p_Delete(&x,nacRing);
@@ -346 +352 @@
       q = napNeg(q);
       q = napAdd(q, qa);
+      nacNormalize(pGetCoeff(r));
       t = nacInvers(pGetCoeff(r));
+      //nacNormalize(t);
       napMultN(q, t);
+      p_Normalize(q,nacRing);
       n_Delete(&t,nacRing);
       p_Delete(&x,nacRing);
@@ -938 +947 @@
 {
   lnumber l=(lnumber)n;
+  naNormalize(n);
   if ((l!=NULL)&&(l->n==NULL)&&(p_IsConstant(l->z,r->algring)))
   {
@@ -968 +978 @@
   if (p==NULL) return NULL;
   naTest(p);
+  //naNormalize(p);
   lnumber erg;
   lnumber src = (lnumber)p;
@@ -1042 +1053 @@
   lu->n = x;
   lu->s = FALSE;
-  number luu=(number)lu;
-  naCoefNormalize(luu);
-  lu=(lnumber)luu;
+  if (lu->n!=NULL)
+  {
+     number luu=(number)lu;
+     naNormalize(luu);
+     lu=(lnumber)luu;
+  }
   naTest((number)lu);
   return (number)lu;
@@ -1104 +1118 @@
   lu->n = x;
   lu->s = FALSE;
-  number luu=(number)lu;
-  naCoefNormalize(luu);
-  lu=(lnumber)luu;
+  if (lu->n!=NULL)
+  {
+     number luu=(number)lu;
+     naNormalize(luu);
+     lu=(lnumber)luu;
+  }
   naTest((number)lu);
   return (number)lu;
@@ -1177 +1194 @@
     lo=NULL;
   }
-  else
+#if 1
+  else if (lo->n!=NULL)
   {
     lo->s = 0;
     number luu=(number)lo;
-    naCoefNormalize(luu);
+    naNormalize(luu);
     lo=(lnumber)luu;
   }
+  else
+    lo->s=3;
+#endif
   naTest((number)lo);
   return (number)lo;
@@ -1268 +1289 @@
     p_Delete(&x,nacRing);
   lo->n = x;
-  number luu=(number)lo;
-  naCoefNormalize(luu);
-  lo=(lnumber)luu;
+  if (lo->n!=NULL)
+  {
+    lo->s = 0;
+    number luu=(number)lo;
+    naNormalize(luu);
+    lo=(lnumber)luu;
+  }
+  else
+    lo->s=3;
   naTest((number)lo);
   return (number)lo;
@@ -1689 +1716 @@
   number nz; // all denom. of the numerator
   nz=p_GetAllDenom(p->z,nacRing);
-  number nn;
-  nn=p_GetAllDenom(p->n,nacRing);
   BOOLEAN norm=FALSE;
   if (!n_IsOne(nz,nacRing))
@@ -1710 +1735 @@
     n_Delete(&nz, nacRing);
   }
+  if (norm)
+  {
+    norm=FALSE;
+    p_Normalize(p->z,nacRing);
+    p_Normalize(p->n,nacRing);
+  }
+  number nn;
+  nn=p_GetAllDenom(p->n,nacRing);
   if (!n_IsOne(nn,nacRing))
   {
@@ -1726 +1759 @@
     p_Normalize(p->n,nacRing);
   }
+  // remove common factors in n, z:
+  if (p->n!=NULL)
+  {
+    poly pp=p->z;
+    nz=n_Copy(pGetCoeff(pp),nacRing);
+    pIter(pp);
+    while(pp!=NULL)
+    { 
+      if (n_IsOne(nz,nacRing)) break;
+      number d=n_Gcd(nz,pGetCoeff(pp),nacRing);
+      n_Delete(&nz,nacRing); nz=d;
+      pIter(pp);
+    }
+    if (!n_IsOne(nz,nacRing))
+    {
+      pp=p->n;
+      nn=n_Copy(pGetCoeff(pp),nacRing);
+      pIter(pp);
+      while(pp!=NULL)
+      { 
+        if (n_IsOne(nn,nacRing)) break;
+        number d=n_Gcd(nn,pGetCoeff(pp),nacRing);
+        n_Delete(&nn,nacRing); nn=d;
+        pIter(pp);
+      }
+      number ng=n_Gcd(nz,nn,nacRing);
+      n_Delete(&nn,nacRing);
+      if (!n_IsOne(ng,nacRing))
+      {
+        number ni=n_Invers(ng,nacRing);
+        p->z=p_Mult_nn(p->z,ni,nacRing);
+        p->n=p_Mult_nn(p->n,ni,nacRing);
+        p_Normalize(p->z,nacRing);
+        p_Normalize(p->n,nacRing);
+        n_Delete(&ni,nacRing);
+      }
+      n_Delete(&ng,nacRing);
+    }
+    n_Delete(&nz,nacRing);
+  }
+
   if ((p->n!=NULL)
   && (p_IsConstant(p->n,nacRing))