Changeset 558f3cc in git

Timestamp:

Jan 4, 2013, 6:39:47 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

8f296a6216092a84f1ebb509dbcda5fe428004f7

Parents:

d9947d272d574a169450505d43dc8ad3a5b4d0f0

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-01-04 18:39:47+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-01-15 20:41:56+01:00

Message:

Fix: make positive leading coeff at normalizing!

Location:

libpolys

Files:

• coeffs/longrat.cc (modified) (3 diffs)
• polys/ext_fields/algext.cc (modified) (2 diffs)
• polys/ext_fields/transext.cc (modified) (5 diffs)

libpolys/coeffs/longrat.cc

@@ -2664 +2664 @@
 }
 
-void nlClearContent(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs cf)
+static void nlClearContent(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs cf)
 {
   assume(cf != NULL);
@@ -2757 +2757 @@
 }
 
-void nlClearContentNoPositiveLead(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs cf)
-{
-  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!!!
-
-  // part 1, find a small candidate for gcd
-  number cand1,cand;
-  int s1,s;
-  s=2147483647; // max. int
-
-  const BOOLEAN lc_is_pos = TRUE; // nlGreaterZero(numberCollectionEnumerator.Current(),cf);
-
-  int normalcount = 0;
-  do
-  {
-    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)
-    {
-      cand=cand1;
-      s=s1;
-    }
-  } 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();
-
-  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;
-
-      if(!lc_is_pos)
-      {
-        // make the leading coeff positive
-        c = nlNeg(c, cf);
-        numberCollectionEnumerator.Reset();
-
-        while (numberCollectionEnumerator.MoveNext() )
-        {
-          number& nn = numberCollectionEnumerator.Current();
-          nn = nlNeg(nn, cf);
-        }
-      }
-      return;
-    }
-  } 
-
-  // part3: all coeffs = all coeffs / cand
-  if (!lc_is_pos)
-    cand = nlNeg(cand,cf);
-
-  c = cand;
-  numberCollectionEnumerator.Reset();
-
-  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;
-  }
-}
-
-void nlClearDenominators(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs cf)
+static void nlClearDenominators(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs cf)
 {
   assume(cf != NULL);
@@ -2937 +2844 @@
   c = cand;
   
-  while (numberCollectionEnumerator.MoveNext() )
-  {
-    number &n = numberCollectionEnumerator.Current();
-    n_InpMult(n, cand, cf);
-  }
-
-}
-
-
-void nlClearDenominatorsNoPositiveLead(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs cf)
-{
-  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
-
-  // part 1, collect product of all denominators /gcds
-  number cand;
-  cand=ALLOC_RNUMBER();
-#if defined(LDEBUG)
-  cand->debug=123456;
-#endif
-  cand->s=3;
-
-  int s=0;
-
-  const BOOLEAN lc_is_pos = TRUE; // nlGreaterZero(numberCollectionEnumerator.Current(),cf);
-
-  do
-  {
-    number& cand1 = numberCollectionEnumerator.Current();
-
-    if (!(SR_HDL(cand1)&SR_INT))
-    {
-      nlNormalize(cand1, cf);
-      if ((!(SR_HDL(cand1)&SR_INT)) // not a short int
-          && (cand1->s==1))             // and is a normalised rational
-      {
-        if (s==0) // first denom, we meet
-        {
-          mpz_init_set(cand->z, cand1->n); // cand->z = cand1->n
-          s=1;
-        }
-        else // we have already something
-        {
-          mpz_lcm(cand->z, cand->z, cand1->n);
-        }
-      }
-    }
-  }
-  while (numberCollectionEnumerator.MoveNext() );
-
-
-  if (s==0) // nothing to do, all coeffs are already integers
-  {
-//    mpz_clear(tmp);
-    FREE_RNUMBER(cand);
-    if (lc_is_pos)
-      c=nlInit(1,cf);
-    else
-    {
-      // make the leading coeff positive
-      c=nlInit(-1,cf);
-
-      // TODO: incorporate the following into the loop below?
-      numberCollectionEnumerator.Reset();
-      while (numberCollectionEnumerator.MoveNext() )
-      {
-        number& n = numberCollectionEnumerator.Current();
-        n = nlNeg(n, cf);
-      } 
-    }
-    return;
-  }
-
-  cand = nlShort3(cand);
-
-  // part2: all coeffs = all coeffs * cand
-  // make the lead coeff positive
-  numberCollectionEnumerator.Reset();
-
-  if (!lc_is_pos)
-    cand = nlNeg(cand, cf);
-
-  c = cand;
-
   while (numberCollectionEnumerator.MoveNext() )
   {

libpolys/polys/ext_fields/algext.cc

@@ -1114 +1114 @@
   number cc;
 
-  extern void nlClearContentNoPositiveLead(ICoeffsEnumerator&, number&, const coeffs);
-
-  nlClearContentNoPositiveLead(itr, cc, Q); // TODO: get rid of (-LC) normalization!? 
+  n_ClearContent(itr, cc, Q); // TODO: get rid of (-LC) normalization!? 
 
   // over alg. ext. of Q // takes over the input number
@@ -1190 +1188 @@
   number n;
   CRecursivePolyCoeffsEnumerator<NAConverter> itr(numberCollectionEnumerator); // recursively treat the numbers as polys!
-
-  extern void nlClearDenominatorsNoPositiveLead(ICoeffsEnumerator&, number&, const coeffs);
-
-  nlClearDenominatorsNoPositiveLead(itr, n, Q); // this should probably be fine...
+  n_ClearDenominators(itr, n, Q); // this should probably be fine...
   c = (number)p_NSet(n, cf->extRing); // over alg. ext. of Q // takes over the input number
 }

libpolys/polys/ext_fields/transext.cc

@@ -101 +101 @@
 
 
-extern void nlClearContent(ICoeffsEnumerator&, number&, const coeffs);
-extern void nlClearContentNoPositiveLead(ICoeffsEnumerator&, number&, const coeffs);
-
-//extern void nlClearDenominators(ICoeffsEnumerator&, number&, const coeffs);
-//extern void nlClearDenominatorsNoPositiveLead(ICoeffsEnumerator&, number&, const coeffs);
-
-
 omBin fractionObjectBin = omGetSpecBin(sizeof(fractionObject));
 
@@ -315 +308 @@
 
     n_ClearDenominators(itr, g, ntRing->cf);
-//    nlClearDenominators(itr, g, ntRing->cf);
 
     if( !n_GreaterZero(g, ntRing->cf) )
@@ -402 +394 @@
 
   n_ClearDenominators(itr, g, ntRing->cf); // may return -1 :(((
-//    nlClearDenominators(itr, g, ntRing->cf);
-
 
   if( !n_GreaterZero(g, ntRing->cf) )
@@ -556 +546 @@
 
     n_ClearDenominators(itr, g, ntRing->cf);
-//    nlClearDenominators(itr, g, ntRing->cf);
 
     if( !n_GreaterZero(g, ntRing->cf) )
@@ -1825 +1814 @@
   number cc;
 
-//  nlClearContentNoPositiveLead(itr, cc, Q); // TODO: get rid of (-LC) normalization!?
-  nlClearContent(itr, cc, Q);
+  n_ClearContent(itr, cc, Q);
   number g = ntInit(p_NSet(cc, R), cf);