Changeset 6036d90 in git for factory/facFactorize.cc

Timestamp:

Nov 18, 2011, 5:41:42 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

615ca847eb54f53d0896364932b51cc9074dffda

Parents:

7d58b610fedb008c184de5ef38c1cd5bc05d1ecc

git-author:

Martin Lee <martinlee84@web.de>2011-11-18 17:41:42+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-19 03:27:46+01:00

Message:

added heuristic for sparse lifting and updated tests

File:

• factory/facFactorize.cc (modified) (1 diff)

factory/facFactorize.cc

@@ -695 +695 @@
     refineBiFactors (A, biFactors, Aeval2, evaluation, minFactorsLength);
 
+  if (differentSecondVar == A.level() - 2)
+  {
+    bool zeroOccured= false;
+    for (CFListIterator iter= evaluation; iter.hasItem(); iter++)
+    {
+      if (iter.getItem().isZero())
+      {
+        zeroOccured= true;
+        break;
+      }
+    }
+    if (!zeroOccured)
+    {
+      factors= sparseHeuristic (A, biFactors, Aeval2, evaluation, minFactorsLength);
+      if (factors.length() == biFactors.length())
+      {
+        appendSwapDecompress (factors, contentAFactors, N, 0, 0, x);
+        normalize (factors);
+        delete [] Aeval2;
+        return factors;
+      }
+      else
+        factors= CFList();
+      //TODO case where factors.length() > 0
+    }
+  }
+
   CFList uniFactors= buildUniFactors (biFactors, evaluation.getLast(), y);