Changeset 5d6ede in git

Timestamp:

Dec 3, 2012, 6:27:03 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

80d7722e6833c629fe2c07881a5d23b7c4a9b4e4

Parents:

05c3b87378ab3e8310b306f10a0eec4bd579ca9c22002e1d9c2f5400230ae871fcff511606690bd1

Message:

Merge pull request #217 from mmklee/sync_master_sw

Sync master sw

Location:

factory

Files:

• cf_gcd_smallp.cc (modified) (4 diffs)
• facFqFactorize.cc (modified) (2 diffs)

factory/cf_gcd_smallp.cc

@@ -2000 +2000 @@
   nmod_mat_t FLINTN;
   convertFacCFMatrix2nmod_mat_t (FLINTN, *N);
-  long* dummy= new long [M.rows()];
-  for (int i= 0; i < M.rows(); i++)
-    dummy[i]= 0;
-  long rk= nmod_mat_rref (dummy, FLINTN);
+  long rk= nmod_mat_rref (FLINTN);
 
   N= convertNmod_mat_t2FacCFMatrix (FLINTN);
   nmod_mat_clear (FLINTN);
-  delete dummy;
 #else
   int p= getCharacteristic ();
@@ -2083 +2079 @@
   nmod_mat_t FLINTN;
   convertFacCFMatrix2nmod_mat_t (FLINTN, *N);
-  long* dummy= new long [M.rows()];
-  for (int i= 0; i < M.rows(); i++)
-    dummy[i]= 0;
-  long rk= nmod_mat_rref (dummy, FLINTN);
+  long rk= nmod_mat_rref (FLINTN);
 #else
   int p= getCharacteristic ();
@@ -2101 +2094 @@
 #ifdef HAVE_FLINT
     nmod_mat_clear (FLINTN);
-    delete dummy;
 #endif
     delete N;
@@ -2109 +2101 @@
   N= convertNmod_mat_t2FacCFMatrix (FLINTN);
   nmod_mat_clear (FLINTN);
-  delete dummy;
 #else
   N= convertNTLmat_zz_p2FacCFMatrix (*NTLN);

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;