Changeset 22002e in git

Timestamp:

Dec 3, 2012, 4:44:42 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

5d6ede284ce6c0064acbc39ec074ebdcdbfd9adf

Parents:

147b6dfdbc378cdc8a9dba3bdaec7bd7b459613f

git-author:

Martin Lee <martinlee84@web.de>2012-12-03 16:44:42+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-12-03 16:47:10+01:00

Message:

chg: synchronising master and spielwiese

File:

• factory/facFqFactorize.cc (modified) (2 diffs)

factory/facFqFactorize.cc

@@ -1576 +1576 @@
           CFList result;
           result.append (LCF);
-          for (int k= 1; k <= factors.length(); k++)
-            result.append (LCF);
+          for (int j= 1; j <= factors.length(); j++)
+            result.append (1);
+          result= distributeContent (result, differentSecondVarLCs, lSecondVarLCs);
+          if (!result.getFirst().inCoeffDomain())
+          {
+            CFListIterator iter= result;
+            CanonicalForm tmp= iter.getItem();
+            iter++;
+            for (; iter.hasItem(); iter++)
+              iter.getItem() *= tmp;
+          }
           y= Variable (1);
           delete [] bufSqrfFactors;
@@ -1589 +1598 @@
     CFList result;
     result.append (LCF);
-    for (int k= 1; k <= factors.length(); k++)
-      result.append (LCF);
+    for (int j= 1; j <= factors.length(); j++)
+      result.append (1);
+    result= distributeContent (result, differentSecondVarLCs, lSecondVarLCs);
+    if (!result.getFirst().inCoeffDomain())
+    {
+      CFListIterator iter= result;
+      CanonicalForm tmp= iter.getItem();
+      iter++;
+      for (; iter.hasItem(); iter++)
+        iter.getItem() *= tmp;
+    }
     y= Variable (1);
     delete [] bufSqrfFactors;