Changeset 560a3d in git

Timestamp:

Aug 9, 2012, 8:18:56 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

824c47a7ef5b40564c34a1392fd8a3a44558959b

Parents:

26261f3e3a71ec10b43bb39f396cf86e27ac06f8

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-08-09 20:18:56+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-08-09 20:20:00+02:00

Message:

fixing bug (use of non-initialized value) in nlClearDenominators and minor improvements

Location:

libpolys/coeffs

Files:

• longrat.cc (modified) (3 diffs)
• numbers.cc (modified) (1 diff)

libpolys/coeffs/longrat.cc

@@ -2691 +2691 @@
 
   // part 1, collect product of all denominators /gcds
-  number cand,cand1;
+  number cand; 
   cand=ALLOC_RNUMBER();
   #if defined(LDEBUG)
@@ -2704 +2704 @@
   do
   {
+    number& cand1 = numberCollectionEnumerator.Current();
+    nlNormalize(cand1, cf);
+    
     if (!(SR_HDL(cand1)&SR_INT))
     {
-      nlNormalize(numberCollectionEnumerator.Current(),cf);
-      cand1= numberCollectionEnumerator.Current();
       if ((!(SR_HDL(cand1)&SR_INT)) // not a short int
       && (cand1->s==1))             // and is rational
@@ -2739 +2740 @@
  
   // part2: all coeffs = all coeffs * cand
-  c=cand;
+  c = cand;
   numberCollectionEnumerator.Reset();
   do
   {
-    number t=nlMult(numberCollectionEnumerator.Current(),cand,cf);
-    nlDelete(&numberCollectionEnumerator.Current(),cf);
-    nlNormalize(t,cf);
-    numberCollectionEnumerator.Current()=t;
+    number &n = numberCollectionEnumerator.Current();
+    n_InpMult(n, cand, cf);
   } while (numberCollectionEnumerator.MoveNext() ); 
  

libpolys/coeffs/numbers.cc

@@ -187 +187 @@
 {
   assume( r != NULL );
-  assume( !(nCoeff_is_Q(r) || nCoeff_is_transExt(r)) );
-  assume( nCoeff_is_Ring(r) || nCoeff_is_Zp(r) || nCoeff_is_numeric(r) || nCoeff_is_GF(r) || (getCoeffType(r)==n_algExt) );
+  assume( !(nCoeff_is_Q(r) || nCoeff_is_transExt(r) || nCoeff_is_algExt(r)) );
+  assume( nCoeff_is_Ring(r) || nCoeff_is_Zp(r) || nCoeff_is_numeric(r) || nCoeff_is_GF(r) );
 
   d = n_Init(1, r);