Changeset 4cf4dc in git for factory/facFactorize.cc

Timestamp:

Aug 20, 2012, 9:44:16 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

589ef64cf8eb3dc278fc36630707eda2b0125578

Parents:

27e0172370323ce80587df1d73a66392a08a5c03

git-author:

Martin Lee <martinlee84@web.de>2012-08-20 21:44:16+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-09-04 18:01:18+02:00

Message:

chg: more improvements to heuristic to distribute leading coeff

File:

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

factory/facFactorize.cc

@@ -1055 +1055 @@
               foundMultiplier= true;
               iter.getItem()= 1;
-              break;
             }
           }
@@ -1067 +1066 @@
           for (iter= contents; iter.hasItem(); iter++, iter2++, index++)
           {
-            if (!(iter.getItem().isOne()) &&
+            if (!iter.getItem().isOne() &&
                 fdivides (iter.getItem(), LCmultiplier))
             {
@@ -1086 +1085 @@
                 LCmultiplier /= iter.getItem();
                 iter.getItem()= 1;
-                break;
               }
               else //factor consists of just leading coeff
               {
-                CanonicalForm vars=getVars (iter.getItem());
-                CanonicalForm factor;
-                Variable xx;
-                bool oneVariableNotInCommon= false;
-                for (int i= 0; i < A.level()-2; i++)
+                Variable xx= Variable (2);
+                CanonicalForm vars;
+                vars= power (xx, degree (LC (getItem(oldBiFactors, index),1),
+                                          xx));
+                for (int i= 0; i < A.level() -2; i++)
                 {
                   if (oldAeval[i].isEmpty())
                     continue;
                   xx= oldAeval[i].getFirst().mvar();
-                  factor= LC (getItem (oldAeval[i], index),1);
-                  if ((factor.inCoeffDomain() && degree (vars,xx) > 0) ||
-                      (degree (factor,xx) > 0 && degree (vars,xx) <= 0)) //scan for bivariate factors with leading coeff that does not contain variables which occur in LCmultiplier
-                  {
-                    oneVariableNotInCommon= true;
-                    break;
-                  }
+                  vars *= power (xx, degree (LC (getItem(oldAeval[i], index),1),
+                                             xx));
                 }
-                if (oneVariableNotInCommon)
+                if (myGetVars(content(getItem(leadingCoeffs2[A.level()-3],index),1))
+                    /myGetVars (LCmultiplier) == vars)
                 {
                   int index2= 1;
@@ -1115 +1109 @@
                     if (index2 == index)
                     {
-                      iter2.getItem() /= iter.getItem();
+                      iter2.getItem() /= LCmultiplier;
                       foundMultiplier= true;
                       break;
                     }
                   }
-                  A /= iter.getItem();
-                  LCmultiplier /= iter.getItem();
+                  A /= LCmultiplier;
                   iter.getItem()= 1;
-                  break;
-                }
-              }
-            }
-          }
-          // wipe out the last LCmultiplier
-          if (foundMultiplier)
-          {
-            index= 1;
-            for (iter= contents; iter.hasItem(); iter++, index++)
-            {
-              if (!iter.getItem().isOne() &&
-                  fdivides (LCmultiplier, iter.getItem()))
-              {
-                int index2= 1;
-                for (iter2= leadingCoeffs2[A.level()-3]; iter2.hasItem();
-                     iter2++, index2++)
-                {
-                  if (index2 == index)
-                  {
-                    iter2.getItem() /= LCmultiplier;
-                    A /= LCmultiplier;
-                    iter.getItem() /= LCmultiplier;
-                  }
                 }
               }