Changeset 9d572a5 in git for factory/facFqBivar.cc

Timestamp:

Aug 30, 2012, 6:22:26 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

621271b927d1fdc10d6cecef99d86f869d2563dc

Parents:

32a8db29c4a1071141bad215324303654975186d

git-author:

Martin Lee <martinlee84@web.de>2012-08-30 18:22:26+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-09-05 15:00:02+02:00

Message:

fix: bug in bivariate factorization over non prime finite fields

File:

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

factory/facFqBivar.cc

@@ -5151 +5151 @@
     else
     {
-      int * zeroOne= extractZeroOneVecs (NTLN);
+      int * zeroOne;
+      long numCols, numRows;
+      if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+      {
+        numCols= NTLN.NumCols();
+        numRows= NTLN.NumRows();
+        zeroOne= extractZeroOneVecs (NTLN);
+      }
+      else
+      {
+        numCols= NTLNe.NumCols();
+        numRows= NTLNe.NumRows();
+        zeroOne= extractZeroOneVecs (NTLNe);
+      }
       CFList bufBufUniFactors= bufUniFactors;
       CFListIterator iter, iter2;
@@ -5157 +5170 @@
       CFList factorsConsidered;
       CanonicalForm tmp;
-      for (int i= 0; i < NTLN.NumCols(); i++)
+      for (int i= 0; i < numCols; i++)
       {
         if (zeroOne [i] == 0)
@@ -5164 +5177 @@
         buf= 1;
         factorsConsidered= CFList();
-        for (int j= 0; j < NTLN.NumRows(); j++, iter++)
-        {
-          if (!IsZero (NTLN (j + 1,i + 1)))
+        for (int j= 0; j < numRows; j++, iter++)
+        {
+          if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
           {
-            factorsConsidered.append (iter.getItem());
-            buf *= mod (iter.getItem(), y);
+            if (!IsZero (NTLN (j + 1,i + 1)))
+            {
+              factorsConsidered.append (iter.getItem());
+              buf *= mod (iter.getItem(), y);
+            }
+          }
+          else
+          {
+            if (!IsZero (NTLNe (j + 1,i + 1)))
+            {
+              factorsConsidered.append (iter.getItem());
+              buf *= mod (iter.getItem(), y);
+            }
           }
         }