Changeset b1d287 in git for factory/facMul.cc

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:

• factory/facMul.cc (modified) (4 diffs)

factory/facMul.cc

@@ -1348 +1348 @@
                     CanonicalForm& M)
 {
-  int d1= tmax (degree (F, 1), degree (G, 1)) + 1;
+  int d1= degree (F, 1) + degree (G, 1) + 1;
   d1 /= 2;
   d1 += 1;
@@ -1417 +1417 @@
                     CanonicalForm& M)
 {
-  int d1= tmax (degree (F, 1), degree (G, 1)) + 1;
+  int d1= degree (F, 1) + degree (G, 1) + 1;
   d1 /= 2;
   d1 += 1;
@@ -2435 +2435 @@
     else
     {
+      bool zz_pEbak= zz_pE::initialized();
+      zz_pEBak bak;
+      if (zz_pEbak)
+        bak.save();
       zz_pX mipo= convertFacCF2NTLzzpX (M);
       Variable y= Variable (2);
@@ -2442 +2446 @@
       div (NTLA, NTLA, NTLB);
       Q= convertNTLzz_pEX2CF (NTLA, x, y);
+      if (zz_pEbak)
+        bak.restore();
     }
   }