Changeset 042111 in git for kernel/polys1.cc

Timestamp:

Aug 17, 2005, 3:54:56 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ec7d7419da114fca1ac19c6e32f337aea021277a

Parents:

2c477e6cc69ee9025c77b5218d60f1a042b18d7a

Message:

*hannes: pContent for Q_a improved


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

File:

• kernel/polys1.cc (modified) (3 diffs)

kernel/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.13 2005-04-18 14:50:56 Singular Exp $ */
+/* $Id: polys1.cc,v 1.14 2005-08-17 13:54:36 Singular Exp $ */
 
 /*
@@ -495 +495 @@
     nNormalize(pGetCoeff(ph));
     if(!nGreaterZero(pGetCoeff(ph))) ph = pNeg(ph);
+    if (rField_is_Q_a())
+    {
+      h = nlInit(1);
+      p=ph;
+      while (p!=NULL)
+      { // each monom: coeff in Q_a
+        lnumber c_n_n=(lnumber)pGetCoeff(p);
+        napoly c_n=c_n_n->z;
+        while (c_n!=NULL)
+        { // each monom: coeff in Q
+          d=nlLcm(h,pGetCoeff(c_n),currRing->algring);
+          n_Delete(&h,currRing->algring);
+          h=d;
+          pIter(c_n);
+        }
+        pIter(p);
+      }
+      /* contains the 1/lcm of all denominators in c_n_n->z*/
+      number hz=h;
+      h = nlInit(1);
+      p=ph;
+      while (p!=NULL)
+      { // each monom: coeff in Q_a
+        lnumber c_n_n=(lnumber)pGetCoeff(p);
+        napoly c_n=c_n_n->n;
+        while (c_n!=NULL)
+        { // each monom: coeff in Q
+          d=nlLcm(h,pGetCoeff(c_n),currRing->algring);
+          n_Delete(&h,currRing->algring);
+          h=d;
+          pIter(c_n);
+        }
+        pIter(p);
+      }
+      /* contains the 1/lcm of all denominators in c_n_n->n*/
+      number htmp=nlInvers(h);
+      number hztmp=nlInvers(hz);
+      number hh=nlMult(hz,h);
+      nlDelete(&hz,currRing->algring);
+      nlDelete(&h,currRing->algring);
+      number hg=nlGcd(hztmp,htmp,currRing->algring);
+      nlDelete(&hztmp,currRing->algring);
+      nlDelete(&htmp,currRing->algring);
+      h=nlMult(hh,hg);
+      nlDelete(&hg,currRing->algring);
+      nlDelete(&hh,currRing->algring);
+      if(!nlIsOne(h))
+      {
+        p=ph;
+        while (p!=NULL)
+        { // each monom: coeff in Q_a
+          lnumber c_n_n=(lnumber)pGetCoeff(p);
+          napoly c_n=c_n_n->z;
+          while (c_n!=NULL)
+          { // each monom: coeff in Q
+            d=nlMult(h,pGetCoeff(c_n));
+            nlNormalize(d);
+            nlDelete(&pGetCoeff(c_n),currRing->algring);
+            pGetCoeff(c_n)=d;
+            pIter(c_n);
+          }
+          pIter(p);
+        }
+        p=ph;
+        while (p!=NULL)
+        { // each monom: coeff in Q_a
+          lnumber c_n_n=(lnumber)pGetCoeff(p);
+          napoly c_n=c_n_n->n;
+          while (c_n!=NULL)
+          { // each monom: coeff in Q
+            d=nlMult(h,pGetCoeff(c_n));
+            nlNormalize(d);
+            nlDelete(&pGetCoeff(c_n),currRing->algring);
+            pGetCoeff(c_n)=d;
+            pIter(c_n);
+          }
+          pIter(p);
+        }
+      }
+      nlDelete(&h,currRing->algring);
+    }
     if (rField_is_Q())
     {
@@ -551 +632 @@
     }
 #endif
+    if (rField_is_Q_a())
+    {
+      h = nlInit(1);
+      p=ph;
+      while (p!=NULL)
+      { // each monom: coeff in Q_a
+        lnumber c_n_n=(lnumber)pGetCoeff(p);
+        napoly c_n=c_n_n->z;
+        while (c_n!=NULL)
+        { // each monom: coeff in Q
+          d=nlLcm(h,pGetCoeff(c_n),currRing->algring);
+          n_Delete(&h,currRing->algring);
+          h=d;
+          pIter(c_n);
+        }
+        pIter(p);
+      }
+      /* contains the 1/lcm of all denominators in c_n_n->z*/
+      number hz=h;
+      h = nlInit(1);
+      p=ph;
+      while (p!=NULL)
+      { // each monom: coeff in Q_a
+        lnumber c_n_n=(lnumber)pGetCoeff(p);
+        napoly c_n=c_n_n->n;
+        while (c_n!=NULL)
+        { // each monom: coeff in Q
+          d=nlLcm(h,pGetCoeff(c_n),currRing->algring);
+          n_Delete(&h,currRing->algring);
+          h=d;
+          pIter(c_n);
+        }
+        pIter(p);
+      }
+      /* contains the 1/lcm of all denominators in c_n_n->n*/
+      number htmp=nlInvers(h);
+      number hztmp=nlInvers(hz);
+      number hh=nlMult(hz,h);
+      nlDelete(&hz,currRing->algring);
+      nlDelete(&h,currRing->algring);
+      number hg=nlGcd(hztmp,htmp,currRing->algring);
+      nlDelete(&hztmp,currRing->algring);
+      nlDelete(&htmp,currRing->algring);
+      h=nlMult(hh,hg);
+      nlDelete(&hg,currRing->algring);
+      nlDelete(&hh,currRing->algring);
+      if(!nlIsOne(h))
+      {
+        p=ph;
+        while (p!=NULL)
+        { // each monom: coeff in Q_a
+          lnumber c_n_n=(lnumber)pGetCoeff(p);
+          napoly c_n=c_n_n->z;
+          while (c_n!=NULL)
+          { // each monom: coeff in Q
+            d=nlMult(h,pGetCoeff(c_n));
+            nlNormalize(d);
+            nlDelete(&pGetCoeff(c_n),currRing->algring);
+            pGetCoeff(c_n)=d;
+            pIter(c_n);
+          }
+          pIter(p);
+        }
+        p=ph;
+        while (p!=NULL)
+        { // each monom: coeff in Q_a
+          lnumber c_n_n=(lnumber)pGetCoeff(p);
+          napoly c_n=c_n_n->n;
+          while (c_n!=NULL)
+          { // each monom: coeff in Q
+            d=nlMult(h,pGetCoeff(c_n));
+            nlNormalize(d);
+            nlDelete(&pGetCoeff(c_n),currRing->algring);
+            pGetCoeff(c_n)=d;
+            pIter(c_n);
+          }
+          pIter(p);
+        }
+      }
+      nlDelete(&h,currRing->algring);
+    }
   }
 }