Changeset 36ebfa in git for libpolys/coeffs/longrat.cc

Timestamp:

Sep 12, 2012, 1:14:59 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2ed48b369bc0d2a3c22dd1fc1ff4b91704e73ec6d2f30f8ec6d1db506b36602c98b98bf5f86b1c47

Parents:

a497a11b6125be1576a34c48429ba326cafa35e2d1fbbf7c96369bd83b0fd1a804e99dfb09dd9e5d

Message:

Merge pull request #182 from alexanderdreyer/spielwiese-countedref

Spielwiese countedref (prepare autoloading new types)

File:

• libpolys/coeffs/longrat.cc (modified) (7 diffs)

libpolys/coeffs/longrat.cc

@@ -2645 +2645 @@
   assume(cf != NULL);
   assume(getCoeffType(cf) == ID);
+
+  numberCollectionEnumerator.Reset();
+
+  if( !numberCollectionEnumerator.MoveNext() ) // empty zero polynomial?
+  {
+    c = n_Init(1, cf);
+    return;
+  }
+  
   // all coeffs are given by integers!!!
 
@@ -2651 +2660 @@
   int s1,s;
   s=2147483647; // max. int
-  numberCollectionEnumerator.Reset();
+
+  
   int lc_is_pos=nlGreaterZero(numberCollectionEnumerator.Current(),cf);
+
+  int normalcount = 0;
   do
   {
-    cand1= numberCollectionEnumerator.Current();
-    if (SR_HDL(cand1)&SR_INT) { cand=cand1;break;}
-    assume(cand1->s==3); // all coeffs should be integers
+    number& n = numberCollectionEnumerator.Current();
+    nlNormalize(n, cf); ++normalcount;
+    cand1 = n;
+    
+    if (SR_HDL(cand1)&SR_INT) { cand=cand1; break; }
+    assume(cand1->s==3); // all coeffs should be integers // ==0?!! after printing 
     s1=mpz_size1(cand1->z);
     if (s>s1)
@@ -2666 +2681 @@
   } while (numberCollectionEnumerator.MoveNext() );
 
+//  assume( nlGreaterZero(cand,cf) ); // cand may be a negative integer!
+
   cand=nlCopy(cand,cf);
   // part 2: compute gcd(cand,all coeffs)
+
   numberCollectionEnumerator.Reset();
-  do
-  {
-    nlNormalize(numberCollectionEnumerator.Current(),cf);
-    nlInpGcd(cand,numberCollectionEnumerator.Current(),cf);
+  
+  while (numberCollectionEnumerator.MoveNext() )
+  {
+    number& n = numberCollectionEnumerator.Current();
+
+    if( (--normalcount) <= 0)
+      nlNormalize(n, cf);
+
+    nlInpGcd(cand, n, cf);
+
+    assume( nlGreaterZero(cand,cf) );
+    
     if(nlIsOne(cand,cf))
     {
-      c=cand;
+      c = cand;
+
       if(!lc_is_pos)
       {
         // make the leading coeff positive
-        c=nlNeg(c,cf);
+        c = nlNeg(c, cf);
         numberCollectionEnumerator.Reset();
-        do
+        
+        while (numberCollectionEnumerator.MoveNext() )
         {
-          numberCollectionEnumerator.Current()=nlNeg(numberCollectionEnumerator.Current(),cf);
-        } while (numberCollectionEnumerator.MoveNext() );
+          number& nn = numberCollectionEnumerator.Current();
+          nn = nlNeg(nn, cf);
+        }
       }
       return;
     }
-  } while (numberCollectionEnumerator.MoveNext() );
+  } 
 
   // part3: all coeffs = all coeffs / cand
-  if (!lc_is_pos) cand=nlNeg(cand,cf);
-  c=cand;
+  if (!lc_is_pos)
+    cand = nlNeg(cand,cf);
+  
+  c = cand;
   numberCollectionEnumerator.Reset();
-  do
-  {
-    number t=nlIntDiv(numberCollectionEnumerator.Current(),cand,cf);
-    nlDelete(&numberCollectionEnumerator.Current(),cf);
-    numberCollectionEnumerator.Current()=t;
-  } while (numberCollectionEnumerator.MoveNext() );
-
+
+  while (numberCollectionEnumerator.MoveNext() )
+  {
+    number& n = numberCollectionEnumerator.Current();
+    number t=nlIntDiv(n, cand, cf); // simple integer exact division, no ratios to remain
+    nlDelete(&n, cf);
+    n = t;
+  }
 }
 
@@ -2707 +2739 @@
   assume(cf != NULL);
   assume(getCoeffType(cf) == ID);
+
+  numberCollectionEnumerator.Reset();
+  
+  if( !numberCollectionEnumerator.MoveNext() ) // empty zero polynomial?
+  {
+    c = n_Init(1, cf);
+    return;
+  }
+
   // all coeffs are given by integers after returning from this routine
 
@@ -2712 +2753 @@
   number cand;
   cand=ALLOC_RNUMBER();
-  #if defined(LDEBUG)
+#if defined(LDEBUG)
   cand->debug=123456;
-  #endif
+#endif
   cand->s=3;
 
   int s=0;
-  mpz_t tmp;
-  mpz_init(tmp);
-  numberCollectionEnumerator.Reset();
+//  mpz_t tmp; mpz_init(tmp); // tmp = GMP int
+  
   int lc_is_pos=nlGreaterZero(numberCollectionEnumerator.Current(),cf);
+
   do
   {
@@ -2730 +2771 @@
       nlNormalize(cand1, cf);
       if ((!(SR_HDL(cand1)&SR_INT)) // not a short int
-      && (cand1->s==1))             // and is rational
+      && (cand1->s==1))             // and is a normalised rational
       {
         if (s==0) // first denom, we meet
         {
-          mpz_init_set(cand->z,cand1->n);
+          mpz_init_set(cand->z, cand1->n); // cand->z = cand1->n
           s=1;
         }
         else // we have already something
         {
-          mpz_gcd(tmp,cand->z,cand1->n);
-          if (mpz_cmp_si(tmp,1)!=0)
-          {
-            mpz_divexact(cand->z,cand->z,tmp);
-          }
-          mpz_mul(cand->z,cand->z,cand1->n);
+          mpz_lcm(cand->z, cand->z, cand1->n);
+/*                  
+          mpz_gcd(tmp,cand->z,cand1->n); // tmp = GCD( cand->z, cand1->n )
+          
+          if (mpz_cmp_si(tmp,1)!=0) 
+            mpz_divexact(cand->z,cand->z,tmp); // cand->z /= tmp
+          
+          mpz_mul(cand->z,cand->z,cand1->n); // cand->z *= cand1->n
+*/
         }
       }
     }
-  } while (numberCollectionEnumerator.MoveNext() );
+  }
+  while (numberCollectionEnumerator.MoveNext() );
+  
 
   if (s==0) // nothing to do, all coeffs are already integers
   {
-    mpz_clear(tmp);
+//    mpz_clear(tmp);
     FREE_RNUMBER(cand);
     if (lc_is_pos)
@@ -2760 +2806 @@
       // make the leading coeff positive
       c=nlInit(-1,cf);
+
+      // TODO: incorporate the following into the loop below?
       numberCollectionEnumerator.Reset();
-      do
-      {
-        numberCollectionEnumerator.Current()=nlNeg(numberCollectionEnumerator.Current(),cf);
-      } while (numberCollectionEnumerator.MoveNext() );
+      while (numberCollectionEnumerator.MoveNext() )
+      {
+        number& n = numberCollectionEnumerator.Current();
+        n = nlNeg(n, cf);
+      } 
     }
     return;
   }
-  cand=nlShort3(cand);
+
+  cand = nlShort3(cand);
 
   // part2: all coeffs = all coeffs * cand
   // make the lead coeff positive
   numberCollectionEnumerator.Reset();
-  if (!nlGreaterZero(numberCollectionEnumerator.Current(),cf))
-  {
-    cand=nlNeg(cand,cf);
-  }
+  
+  if (!lc_is_pos)
+    cand = nlNeg(cand, cf);
+  
   c = cand;
-  do
+  
+  while (numberCollectionEnumerator.MoveNext() )
   {
     number &n = numberCollectionEnumerator.Current();
     n_InpMult(n, cand, cf);
-  } while (numberCollectionEnumerator.MoveNext() );
+  }
 
 }