Changeset b1d287 in git for factory/facMul.cc


Ignore:
Timestamp:
Aug 1, 2012, 2:25:24 AM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')
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/facMul.cc

    r09afeb rb1d287  
    13481348                    CanonicalForm& M)
    13491349{
    1350   int d1= tmax (degree (F, 1), degree (G, 1)) + 1;
     1350  int d1= degree (F, 1) + degree (G, 1) + 1;
    13511351  d1 /= 2;
    13521352  d1 += 1;
     
    14171417                    CanonicalForm& M)
    14181418{
    1419   int d1= tmax (degree (F, 1), degree (G, 1)) + 1;
     1419  int d1= degree (F, 1) + degree (G, 1) + 1;
    14201420  d1 /= 2;
    14211421  d1 += 1;
     
    24352435    else
    24362436    {
     2437      bool zz_pEbak= zz_pE::initialized();
     2438      zz_pEBak bak;
     2439      if (zz_pEbak)
     2440        bak.save();
    24372441      zz_pX mipo= convertFacCF2NTLzzpX (M);
    24382442      Variable y= Variable (2);
     
    24422446      div (NTLA, NTLA, NTLB);
    24432447      Q= convertNTLzz_pEX2CF (NTLA, x, y);
     2448      if (zz_pEbak)
     2449        bak.restore();
    24442450    }
    24452451  }
Note: See TracChangeset for help on using the changeset viewer.