Changeset b1d287 in git for factory/cf_gcd_smallp.cc


Ignore:
Timestamp:
Aug 1, 2012, 2:25:24 AM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')
Children:
0df59c8a8e59eded04e4aca4e57cfed188a00cf1
Parents:
09afeb85ea17e564813761786f76281c8162dad0362fc6799a207ad61d3be8abe0206e52b5782e50
Message:
Merge pull request #157 from mmklee/factory_catch_up_sw

Factory catch up sw
File:
1 edited

Legend:

Unmodified
Added
Removed

  • factory/cf_gcd_smallp.cc

    r09afeb rb1d287  
    1212 * @par Copyright:
    1313 *   (c) by The SINGULAR Team, see LICENSE file
    14  *
    15  * @internal
    16  * @version \$Id$
    1714 *
    1815**/
    … …  
    539536  CanonicalForm gcdcAcB;
    540537
    541   if (topLevel)
    542   {
    543     if (best_level <= 2)
    544       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, best_level);
    545     else
    546       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, 2);
    547   }
    548   else
    549   {
    550     cA = uni_content (A);
    551     cB = uni_content (B);
    552     gcdcAcB= gcd (cA, cB);
    553     ppA= A/cA;
    554     ppB= B/cB;
    555   }
     538  cA = uni_content (A);
     539  cB = uni_content (B);
     540  gcdcAcB= gcd (cA, cB);
     541  ppA= A/cA;
     542  ppB= B/cB;
    556543
    557544  int sizeNewtonPolyg;
    … …  
    1005992  CanonicalForm gcdcAcB;
    1006993
    1007   if (topLevel)
    1008   {
    1009     if (best_level <= 2)
    1010       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, best_level);
    1011     else
    1012       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, 2);
    1013   }
    1014   else
    1015   {
    1016     cA = uni_content (A);
    1017     cB = uni_content (B);
    1018     gcdcAcB= gcd (cA, cB);
    1019     ppA= A/cA;
    1020     ppB= B/cB;
    1021   }
     994  cA = uni_content (A);
     995  cB = uni_content (B);
     996  gcdcAcB= gcd (cA, cB);
     997  ppA= A/cA;
     998  ppB= B/cB;
    1022999
    10231000  int sizeNewtonPolyg;
    … …  
    14621439  CanonicalForm gcdcAcB;
    14631440
    1464   if (topLevel)
    1465   {
    1466     if (best_level <= 2)
    1467       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, best_level);
    1468     else
    1469       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, 2);
    1470   }
    1471   else
    1472   {
    1473     cA = uni_content (A);
    1474     cB = uni_content (B);
    1475     gcdcAcB= gcd (cA, cB);
    1476     ppA= A/cA;
    1477     ppB= B/cB;
    1478   }
     1441  cA = uni_content (A);
     1442  cB = uni_content (B);
     1443  gcdcAcB= gcd (cA, cB);
     1444  ppA= A/cA;
     1445  ppB= B/cB;
    14791446
    14801447  int sizeNewtonPolyg;
    … …  
    32333200  CanonicalForm ppA, ppB;    // primitive part of A and B
    32343201  CanonicalForm gcdcAcB;
    3235   if (topLevel)
    3236   {
    3237     if (best_level <= 2)
    3238       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, best_level);
    3239     else
    3240       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, 2);
    3241   }
    3242   else
    3243   {
    3244     cA = uni_content (A);
    3245     cB = uni_content (B);
    3246     gcdcAcB= gcd (cA, cB);
    3247     ppA= A/cA;
    3248     ppB= B/cB;
    3249   }
     3202
     3203  cA = uni_content (A);
     3204  cB = uni_content (B);
     3205  gcdcAcB= gcd (cA, cB);
     3206  ppA= A/cA;
     3207  ppB= B/cB;
    32503208
    32513209  CanonicalForm lcA, lcB;  // leading coefficients of A and B
    … …  
    36443602  CanonicalForm ppA, ppB;    // primitive part of A and B
    36453603  CanonicalForm gcdcAcB;
    3646   if (topLevel)
    3647   {
    3648     if (best_level <= 2)
    3649       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, best_level);
    3650     else
    3651       gcdcAcB= extractContents (A, B, cA, cB, ppA, ppB, 2);
    3652   }
    3653   else
    3654   {
    3655     cA = uni_content (A);
    3656     cB = uni_content (B);
    3657     gcdcAcB= gcd (cA, cB);
    3658     ppA= A/cA;
    3659     ppB= B/cB;
    3660   }
     3604
     3605  cA = uni_content (A);
     3606  cB = uni_content (B);
     3607  gcdcAcB= gcd (cA, cB);
     3608  ppA= A/cA;
     3609  ppB= B/cB;
    36613610
    36623611  CanonicalForm lcA, lcB;  // leading coefficients of A and B
Note: See TracChangeset for help on using the changeset viewer.