Changeset e11ed0 in git

Timestamp:

Aug 10, 2012, 2:45:29 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

e8eba79d5b1d97d0164270764c45f286deab00ca

Parents:

824c47a7ef5b40564c34a1392fd8a3a44558959b

Message:

fix: nlClearDenominator: less nlNormalize, positive leadcoeff

File:

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

libpolys/coeffs/longrat.cc

@@ -865 +865 @@
     long j=SR_TO_INT(b);
     if ((i==-POW_2_28) && (j== -1L))
-    {  
+    {
       FREE_RNUMBER(u);
       return nlRInit(POW_2_28);
@@ -1257 +1257 @@
 
   // numerator modulo char. should fit into int
-  number z = n_Init( static_cast<int>(mpz_fdiv_ui(q->z, PP)), Zp );  
+  number z = n_Init( static_cast<int>(mpz_fdiv_ui(q->z, PP)), Zp );
 
   // denominator != 1?
@@ -2440 +2440 @@
 {
   assume( getCoeffType(r) == ID );
-   
+
   nlTest(n, r);
   nlNormalize(n, r);
@@ -2454 +2454 @@
   mpz_init_set_ui(z->n, 1);
   z->s = 3;
-  return z;   
+  return z;
 }
 
@@ -2629 +2629 @@
       s=s1;
     }
-  } while (numberCollectionEnumerator.MoveNext() ); 
- 
+  } while (numberCollectionEnumerator.MoveNext() );
+
   cand=nlCopy(cand,cf);
   // part 2: compute gcd(cand,all coeffs)
@@ -2641 +2641 @@
     cand=cand1;
     if(nlIsOne(cand,cf)) { c=cand; return; }
-  } while (numberCollectionEnumerator.MoveNext() ); 
- 
+  } while (numberCollectionEnumerator.MoveNext() );
+
   // part3: all coeffs = all coeffs / cand
   c=cand;
@@ -2651 +2651 @@
     nlDelete(&numberCollectionEnumerator.Current(),cf);
     numberCollectionEnumerator.Current()=t;
-  } while (numberCollectionEnumerator.MoveNext() ); 
- 
+  } while (numberCollectionEnumerator.MoveNext() );
+
 }
 
@@ -2662 +2662 @@
 
   // part 1, collect product of all denominators /gcds
-  number cand; 
+  number cand;
   cand=ALLOC_RNUMBER();
   #if defined(LDEBUG)
@@ -2676 +2676 @@
   {
     number& cand1 = numberCollectionEnumerator.Current();
-    nlNormalize(cand1, cf);
-    
+
     if (!(SR_HDL(cand1)&SR_INT))
     {
+      nlNormalize(cand1, cf);
       if ((!(SR_HDL(cand1)&SR_INT)) // not a short int
       && (cand1->s==1))             // and is rational
@@ -2685 +2685 @@
         if (s==0) // first denom, we meet
         {
-          mpz_init_set(cand->z,cand1->n); 
-          s=1; 
+          mpz_init_set(cand->z,cand1->n);
+          s=1;
         }
         else // we have already something
@@ -2699 +2699 @@
       }
     }
-  } while (numberCollectionEnumerator.MoveNext() ); 
+  } while (numberCollectionEnumerator.MoveNext() );
 
   if (s==0) // nothing to do, all coeffs are already integers
   {
     mpz_clear(tmp);
-    FREE_RNUMBER(cand); 
-    c=nlInit(1,cf); 
+    FREE_RNUMBER(cand);
+    c=nlInit(1,cf);
     return;
   }
   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);
+  }
   c = cand;
-  numberCollectionEnumerator.Reset();
   do
   {
     number &n = numberCollectionEnumerator.Current();
     n_InpMult(n, cand, cf);
-  } while (numberCollectionEnumerator.MoveNext() ); 
- 
+  } while (numberCollectionEnumerator.MoveNext() );
+
 }
 
@@ -2732 +2737 @@
   r->cfInitMPZ = nlInitMPZ;
   r->cfMPZ  = nlMPZ;
-   
+
   r->cfMult  = nlMult;
   r->cfSub   = nlSub;
@@ -2743 +2748 @@
   r->cfSize  = nlSize;
   r->cfInt  = nlInt;
-   
+
   r->cfChineseRemainder=nlChineseRemainder;
   r->cfFarey=nlFarey;
@@ -2781 +2786 @@
   r->cfClearContent = nlClearContent;
   r->cfClearDenominators = nlClearDenominators;
-  
+
 #ifdef LDEBUG
   // debug stuff