fix: several issues with --enable-assertions

Singular · Oct 17, 2012 · d5bfecf · d5bfecf
1 parent 7bd16d1
commit d5bfecf
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 9 deletions.
diff --git a/factory/cf_gcd_smallp.cc b/factory/cf_gcd_smallp.cc
@@ -4225,7 +4225,6 @@ Evaluation optimize4Lift (const CanonicalForm& F, CFMap & M,
 
   Evaluation result= Evaluation (A.min(), A.max());
   ASSERT (A.min() == 2, "expected A.min() == 2");
-  ASSERT (A.max() >= n, "expected A.max() >= n");
   int max_deg;
   int k= n;
   int l= 1;

diff --git a/factory/facFqBivarUtil.cc b/factory/facFqBivarUtil.cc
@@ -517,7 +517,10 @@ logarithmicDerivative (const CanonicalForm& F, const CanonicalForm& G, int l,
     bufF -= Up;
   }
 
-  q= newtonDiv (bufF, G, xToLOldL);
+  if (l-oldL > 0)
+    q= newtonDiv (bufF, G, xToLOldL);
+  else
+    q= 0;
   q *= xToOldL;
   q += oldQ;
 

diff --git a/factory/facFqSquarefree.h b/factory/facFqSquarefree.h
@@ -16,6 +16,7 @@
 
 #include "assert.h"
 #include "fac_sqrfree.h"
+#include "cf_factory.h"
 
 /// squarefree factorization over a finite field
 /// @a return a list of squarefree factors with multiplicity

diff --git a/factory/fac_ezgcd.cc b/factory/fac_ezgcd.cc
@@ -214,7 +214,6 @@ Evaluation optimize4Lift (const CanonicalForm& F, CFMap & M,
 
   Evaluation result= Evaluation (A.min(), A.max());
   ASSERT (A.min() == 2, "expected A.min() == 2");
-  ASSERT (A.max() == n, "expected A.max() == n");
   int max_deg;
   int k= n;
   int l= 1;

diff --git a/factory/templates/ftmpl_array.cc b/factory/templates/ftmpl_array.cc
@@ -1,8 +1,6 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 /* $Id$ */
 
-#include <factory/assert.h>
-
 #include <factory/templates/ftmpl_array.h>
 
 template <class T>

diff --git a/factory/templates/ftmpl_list.cc b/factory/templates/ftmpl_list.cc
@@ -1,8 +1,6 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 /* $Id$ */
 
-#include <factory/assert.h>
-
 #include <factory/templates/ftmpl_list.h>
 
 template <class T>

diff --git a/factory/templates/ftmpl_matrix.cc b/factory/templates/ftmpl_matrix.cc
@@ -1,8 +1,6 @@
 /* emacs edit mode for this file is -*- C++ -*- */
 /* $Id$ */
 
-#include <factory/assert.h>
-
 #include <factory/templates/ftmpl_matrix.h>
 
 template <class T>