Changeset 0145f46 in git

Timestamp:

Dec 5, 2012, 6:08:54 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

0724372cdd717d461496b86f89894325fecf6cc0

Parents:

07ff965ddd552fe3a981f417b2da928dca53a8f2f659855c746f8978e0386f9dc2f9d9ecfc3d73b2

Message:

Merge pull request #219 from mmklee/factory_fix_sw

fix: wrong deletion of FLINT matrices

File:

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

factory/facFqBivar.cc

@@ -6364 +6364 @@
   {
 #ifdef HAVE_FLINT
-    nmod_mat_clear (FLINTN);
+    if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+      nmod_mat_clear (FLINTN);
 #endif
     delete [] bounds;
@@ -6379 +6380 @@
   {
 #ifdef HAVE_FLINT
-    nmod_mat_clear (FLINTN);
+    if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+      nmod_mat_clear (FLINTN);
 #endif
     delete [] bounds;
@@ -6427 +6429 @@
       if (result.length() == nmod_mat_ncols (FLINTN))
       {
-        nmod_mat_clear (FLINTN);
+        if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+          nmod_mat_clear (FLINTN);
 #else
       if (result.length() == NTLN.NumCols())
@@ -6441 +6444 @@
       if (result.length() == NTLNe.NumCols())
       {
-#ifdef HAVE_FLINT
-        nmod_mat_clear (FLINTN);
-#endif
         delete [] factorsFoundIndex;
         delete [] bounds;
@@ -6504 +6504 @@
       if (result.length() == NTLNe.NumCols())
       {
-#ifdef HAVE_FLINT
-        nmod_mat_clear (FLINTN);
-#endif
         delete [] factorsFoundIndex;
         delete [] bounds;
@@ -6582 +6579 @@
     if (result.length() == NTLNe.NumCols())
     {
-#ifdef HAVE_FLINT
-      nmod_mat_clear (FLINTN);
-#endif
       delete [] bounds;
       return Union (result, smallFactors);
@@ -6728 +6722 @@
     {
 #ifdef HAVE_FLINT
-      nmod_mat_clear (FLINTN);
+      if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+        nmod_mat_clear (FLINTN);
 #endif
       delete [] bounds;
@@ -6747 +6742 @@
     {
 #ifdef HAVE_FLINT
-      nmod_mat_clear (FLINTN);
+      if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+        nmod_mat_clear (FLINTN);
 #endif
       result.append (bufF);
@@ -6753 +6749 @@
     }
 #ifdef HAVE_FLINT
-    nmod_mat_clear (FLINTN);
+    if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+      nmod_mat_clear (FLINTN);
 #endif
     return Union (result, henselLiftAndLatticeRecombi (bufF, bufUniFactors,
@@ -6812 +6809 @@
       if (result.length()== NTLNe.NumCols())
       {
-#ifdef HAVE_FLINT
-        nmod_mat_clear (FLINTN);
-#endif
         delete [] bounds;
         result= Union (result, smallFactors);
@@ -6871 +6865 @@
         if (result.length() == NTLNe.NumCols())
         {
-#ifdef HAVE_FLINT
-          nmod_mat_clear (FLINTN);
-#endif
           delete [] bounds;
           result= Union (result, smallFactors);
@@ -6891 +6882 @@
   bounds= computeBounds (F, d, isIrreducible);
 #ifdef HAVE_FLINT
-  nmod_mat_clear (FLINTN);
+  if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+    nmod_mat_clear (FLINTN);
 #endif
   if (isIrreducible)