Changeset 8b00ca in git

Timestamp:

Jul 14, 2014, 4:58:16 PM (9 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

b90a36f1c9a83b6e90583185b26f6c5730b47975

Parents:

03f640f7f62621edbfe49fd44dd3646e7f33da1c

git-author:

Martin Lee <martinlee84@web.de>2014-07-14 16:58:16+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-07-17 12:07:11+02:00

Message:

chg: pruning in conversion to factory

File:

• libpolys/polys/clapsing.cc (modified) (13 diffs)

libpolys/polys/clapsing.cc

@@ -124 +124 @@
                     G( convSingAPFactoryAP( g,a,r ) );
       res= convFactoryAPSingAP( gcd( F, G ),r );
+      prune (a);
       if (!b1) Off(SW_USE_QGCD);
     }
@@ -235 +236 @@
       }
       res= convFactoryAPSingAP( GCD,r );
+      prune (a);
       if (!b1) Off(SW_USE_QGCD);
     }
@@ -343 +345 @@
                     G( convSingAPFactoryAP( g,a,r ) );
       res= convFactoryAPSingAP( resultant( F, G, X ),r );
+      prune (a);
     }
     else
@@ -497 +500 @@
       pa=convFactoryAPSingAP(Fa,r);
       pb=convFactoryAPSingAP(Gb,r);
+      prune (a);
     }
     else
@@ -556 +560 @@
                     G( convSingAPFactoryAP( g,a,r ) );
       res= convFactoryAPSingAP(  F / G, r  );
+      prune (a);
     }
     else
@@ -745 +750 @@
       }
     }
+    if (r->cf->extRing!=NULL)
+      if (r->cf->extRing->qideal!=NULL)
+        prune (a);
     if (e==0)
     {
@@ -841 +849 @@
   number old_lead_coeff=n_Copy(pGetCoeff(f), r->cf);
 
+  Variable a;
   if (!rField_is_Zp(r) && !rField_is_Zp_a(r)) /* Q, Q(a) */
   {
@@ -894 +903 @@
       CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->qideal->m[0],
                                            r->cf->extRing);
-      Variable a=rootOf(mipo);
+      a=rootOf(mipo);
       CanonicalForm F( convSingAPFactoryAP( f, a, r ) );
       if (rField_is_Zp_a(r))
@@ -982 +991 @@
       }
     }
+    if (r->cf->extRing!=NULL)
+      if (r->cf->extRing->qideal!=NULL)
+        prune (a);
 #ifndef SING_NDEBUG
     if ((r->cf->extRing!=NULL) && (!p_IsConstantPoly(ff,r)))
@@ -1210 +1222 @@
   number NN=NULL;
   number old_lead_coeff=n_Copy(pGetCoeff(f), r->cf);
+  Variable a;
 
   if (!rField_is_Zp(r) && !rField_is_Zp_a(r)) /* Q, Q(a) */
@@ -1261 +1274 @@
       CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->qideal->m[0],
                                            r->cf->extRing);
-      Variable a=rootOf(mipo);
+      a=rootOf(mipo);
       CanonicalForm F( convSingAPFactoryAP( f, a, r ) );
       L= sqrFree (F);
@@ -1336 +1349 @@
     }
   }
+  if (r->cf->extRing!=NULL)
+    if (r->cf->extRing->qideal!=NULL)
+      prune (a);
   if (rField_is_Q_a(r) && (r->cf->extRing->qideal!=NULL))
   {
@@ -1794 +1810 @@
       mipos->m[i]= convFactoryPSingTrP (replacevar (iter.getItem().minpoly(), alpha, x), r);
     }
+    if (!iter.getItem().minpoly().isOne())
+      prune (alpha);
     numFactors += count;
   }