Changeset ea5ff1d in git for factory


Ignore:
Timestamp:
May 12, 2012, 11:50:13 PM (12 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
d1553c4ccee2126aacc2a8a2ac1923da9be0c131
Parents:
2488dc3b54e30e416a8dcc3afcaa732c127e0b2c
git-author:
Martin Lee <martinlee84@web.de>2012-05-12 23:50:13+02:00
git-committer:
Martin Lee <martinlee84@web.de>2012-07-31 11:32:04+02:00
Message:
chg: deleted extractContents from GCD computation
File:
1 edited

Legend:

Unmodified
Added
Removed

  • factory/cf_gcd_smallp.cc

    r2488dc3 rea5ff1d  
    536536  CanonicalForm gcdcAcB;
    537537
    538   if (topLevel)
    539   {
    540     if (best_level <= 2)
    541       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, best_level);
    542     else
    543       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, 2);
    544   }
    545   else
    546   {
    547     cA = uni_content (A);
    548     cB = uni_content (B);
    549     gcdcAcB= gcd (cA, cB);
    550     ppA= A/cA;
    551     ppB= B/cB;
    552   }
     538  cA = uni_content (A);
     539  cB = uni_content (B);
     540  gcdcAcB= gcd (cA, cB);
     541  ppA= A/cA;
     542  ppB= B/cB;
    553543
    554544  int sizeNewtonPolyg;
    … …  
    1002992  CanonicalForm gcdcAcB;
    1003993
    1004   if (topLevel)
    1005   {
    1006     if (best_level <= 2)
    1007       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, best_level);
    1008     else
    1009       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, 2);
    1010   }
    1011   else
    1012   {
    1013     cA = uni_content (A);
    1014     cB = uni_content (B);
    1015     gcdcAcB= gcd (cA, cB);
    1016     ppA= A/cA;
    1017     ppB= B/cB;
    1018   }
     994  cA = uni_content (A);
     995  cB = uni_content (B);
     996  gcdcAcB= gcd (cA, cB);
     997  ppA= A/cA;
     998  ppB= B/cB;
    1019999
    10201000  int sizeNewtonPolyg;
    … …  
    14591439  CanonicalForm gcdcAcB;
    14601440
    1461   if (topLevel)
    1462   {
    1463     if (best_level <= 2)
    1464       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, best_level);
    1465     else
    1466       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, 2);
    1467   }
    1468   else
    1469   {
    1470     cA = uni_content (A);
    1471     cB = uni_content (B);
    1472     gcdcAcB= gcd (cA, cB);
    1473     ppA= A/cA;
    1474     ppB= B/cB;
    1475   }
     1441  cA = uni_content (A);
     1442  cB = uni_content (B);
     1443  gcdcAcB= gcd (cA, cB);
     1444  ppA= A/cA;
     1445  ppB= B/cB;
    14761446
    14771447  int sizeNewtonPolyg;
    … …  
    32303200  CanonicalForm ppA, ppB;    // primitive part of A and B
    32313201  CanonicalForm gcdcAcB;
    3232   if (topLevel)
    3233   {
    3234     if (best_level <= 2)
    3235       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, best_level);
    3236     else
    3237       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, 2);
    3238   }
    3239   else
    3240   {
    3241     cA = uni_content (A);
    3242     cB = uni_content (B);
    3243     gcdcAcB= gcd (cA, cB);
    3244     ppA= A/cA;
    3245     ppB= B/cB;
    3246   }
     3202
     3203  cA = uni_content (A);
     3204  cB = uni_content (B);
     3205  gcdcAcB= gcd (cA, cB);
     3206  ppA= A/cA;
     3207  ppB= B/cB;
    32473208
    32483209  CanonicalForm lcA, lcB;  // leading coefficients of A and B
    … …  
    36413602  CanonicalForm ppA, ppB;    // primitive part of A and B
    36423603  CanonicalForm gcdcAcB;
    3643   if (topLevel)
    3644   {
    3645     if (best_level <= 2)
    3646       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, best_level);
    3647     else
    3648       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, 2);
    3649   }
    3650   else
    3651   {
    3652     cA = uni_content (A);
    3653     cB = uni_content (B);
    3654     gcdcAcB= gcd (cA, cB);
    3655     ppA= A/cA;
    3656     ppB= B/cB;
    3657   }
     3604
     3605  cA = uni_content (A);
     3606  cB = uni_content (B);
     3607  gcdcAcB= gcd (cA, cB);
     3608  ppA= A/cA;
     3609  ppB= B/cB;
    36583610
    36593611  CanonicalForm lcA, lcB;  // leading coefficients of A and B
Note: See TracChangeset for help on using the changeset viewer.