Changeset 86faff in git

Timestamp:

Nov 5, 2012, 3:32:16 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

6dfc398e71ea196ccb6f9d8b8eb795ebf96f523c

Parents:

6e88340150f9c8853246d5e107fab8042207d29e

git-author:

Martin Lee <martinlee84@web.de>2012-11-05 15:32:16+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-11-16 13:19:19+01:00

Message:

chg: more checks in heurstic to distribute leading coefficients

Location:

factory

Files:

• facFactorize.cc (modified) (1 diff)
• facFqFactorize.cc (modified) (1 diff)

factory/facFactorize.cc

@@ -622 +622 @@
                 !isOnlyLeadingCoeff(iter2.getItem())) //content divides LCmultiplier completely and factor consists of more terms than just the leading coeff
             {
-              int index2= 1;
-              for (CFListIterator iter3= leadingCoeffs2[lengthAeval2-1];
-                   iter3.hasItem(); iter3++, index2++)
+              Variable xx= Variable (2);
+              CanonicalForm vars;
+              vars= power (xx, degree (LC (getItem(oldBiFactors, index),1),
+                                        xx));
+              for (int i= 0; i < lengthAeval2; i++)
               {
-                if (index2 == index)
+                if (oldAeval[i].isEmpty())
+                  continue;
+                xx= oldAeval[i].getFirst().mvar();
+                vars *= power (xx, degree (LC (getItem(oldAeval[i], index),1),
+                                           xx));
+              }
+              if (vars.level() <= 2)
+              {
+                int index2= 1;
+                for (CFListIterator iter3= leadingCoeffs2[lengthAeval2-1];
+                     iter3.hasItem(); iter3++, index2++)
                 {
-                  iter3.getItem() /= LCmultiplier;
-                  break;
+                  if (index2 == index)
+                  {
+                    iter3.getItem() /= LCmultiplier;
+                    break;
+                  }
                 }
+                A /= LCmultiplier;
+                foundMultiplier= true;
+                iter.getItem()= 1;
               }
-              A /= LCmultiplier;
-              foundMultiplier= true;
-              iter.getItem()= 1;
             }
           }

factory/facFqFactorize.cc

@@ -2785 +2785 @@
                 !isOnlyLeadingCoeff(iter2.getItem())) //content divides LCmultiplier completely and factor consists of more terms than just the leading coeff
             {
-              int index2= 1;
-              for (CFListIterator iter3= leadingCoeffs2[lengthAeval2-1];
-                   iter3.hasItem(); iter3++, index2++)
+              Variable xx= Variable (2);
+              CanonicalForm vars;
+              vars= power (xx, degree (LC (getItem(oldBiFactors, index),1),
+                                        xx));
+              for (int i= 0; i < lengthAeval2; i++)
               {
-                if (index2 == index)
+                if (oldAeval[i].isEmpty())
+                  continue;
+                xx= oldAeval[i].getFirst().mvar();
+                vars *= power (xx, degree (LC (getItem(oldAeval[i], index),1),
+                                           xx));
+              }
+              if (vars.level() <= 2)
+              {
+                int index2= 1;
+                for (CFListIterator iter3= leadingCoeffs2[lengthAeval2-1];
+                     iter3.hasItem(); iter3++, index2++)
                 {
-                  iter3.getItem() /= LCmultiplier;
-                  break;
+                  if (index2 == index)
+                  {
+                    iter3.getItem() /= LCmultiplier;
+                    break;
+                  }
                 }
+                A /= LCmultiplier;
+                foundMultiplier= true;
+                iter.getItem()= 1;
               }
-              A /= LCmultiplier;
-              foundMultiplier= true;
-              iter.getItem()= 1;
             }
           }