Changeset 772056 in git for factory/facFqFactorize.cc

Timestamp:

Aug 8, 2012, 2:00:01 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

fce807dd867479a3c2e3030b73a57dbe28db63c6

Parents:

8267b8f9ab43170a4026e7e570df48db4601a748

git-author:

Martin Lee <martinlee84@web.de>2012-08-08 14:00:01+02:00

git-committer:

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

Message:

chg: added new function sortByUniFactors
chg: deleted part of getLeadingCoeffs that is now part of sortByUniFactors

File:

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

factory/facFqFactorize.cc

@@ -1912 +1912 @@
 }
 
+
 void getLeadingCoeffs (const CanonicalForm& A, CFList*& Aeval,
+                       const CFList& uniFactors, const CFList& evaluation
+                      )
+{
+  CFListIterator iter;
+  CFList LCs;
+  for (int j= 0; j < A.level() - 2; j++)
+  {
+    if (!Aeval[j].isEmpty())
+    {
+      LCs= CFList();
+      for (iter= Aeval[j]; iter.hasItem(); iter++)
+        LCs.append (LC (iter.getItem(), 1));
+      //normalize (LCs);
+      Aeval[j]= LCs;
+    }
+  }
+}
+
+void sortByUniFactors (CFList*& Aeval, int AevalLength,
                        const CFList& uniFactors, const CFList& evaluation
                       )
@@ -1923 +1943 @@
   CFArray l;
   int pos, index;
-  for (int j= 0; j < A.level() - 2; j++)
+  for (int j= 0; j < AevalLength; j++)
   {
     if (!Aeval[j].isEmpty())
     {
-      i= A.level();
+      i= evaluation.length() + 1;
       for (iter= evaluation; iter.hasItem(); iter++, i--)
       {
@@ -1956 +1976 @@
 
       buf= buildUniFactors (Aeval[j], evalPoint, v);
-      LCs= CFList();
-      for (iter= Aeval[j]; iter.hasItem(); iter++)
-        LCs.append (LC (iter.getItem(), 1));
-      //normalize (LCs);
-      Aeval[j]= LCs;
     }
   }