Changeset fd5b3a in git

Timestamp:

Jun 28, 2010, 1:35:53 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

6720a11e15dfab1542b96233c960ac929f64c058

Parents:

408edb3114918e2d3fc0bbcaae6914f6245af886

Message:

fixed logarithm


git-svn-id: file:///usr/local/Singular/svn/trunk@12929 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

factory

Files:

• facFqBivar.cc (modified) (1 diff)
• facFqBivar.h (modified) (1 diff)
• facFqFactorize.cc (modified) (2 diffs)
• facFqFactorize.h (modified) (1 diff)

factory/facFqBivar.cc

@@ -932 +932 @@
   // the recombination process
   int factorNums= 5;
-  if (factorNums < (int) ilog2 (totaldegree (A))) 
-    factorNums= (int) ilog2 (totaldegree (A));
+  double logarithm= (double) ilog2 (totaldegree (A));
+  logarithm /= log2exp;
+  logarithm= ceil (logarithm);
+  if (factorNums < (int) logarithm)
+    factorNums= (int) logarithm;
   for (int i= 0; i < factorNums; i++) 
   {

factory/facFqBivar.h

@@ -31 +31 @@
 #include "facFqSquarefree.h"
 
+extern const double log2exp= 1.442695041;
+
 /// Factorization of a squarefree bivariate polynomials over an arbitrary finite 
 /// field, information on the current field we work over is in @a info. @a info

factory/facFqFactorize.cc

@@ -505 +505 @@
 
   int factorNums= 5;
-  if (factorNums < (int) ilog2 (totaldegree (A)))
-    factorNums= (int) ilog2 (totaldegree (A));
+  double logarithm= (double) ilog2 (totaldegree (A));
+  logarithm /= log2exp;
+  logarithm= ceil (logarithm);
+  if (factorNums < (int) logarithm)
+    factorNums= (int) logarithm;
   for (int i= 0; i < factorNums; i++)
   {
@@ -1774 +1777 @@
   CanonicalForm evalPoly;
   int lift, bufLift;
-  if (factorNums < (int) ilog2 (totaldegree (A)))
-    factorNums= (int) ilog2 (totaldegree (A));
+  double logarithm= (double) ilog2 (totaldegree (A));
+  logarithm /= log2exp;
+  logarithm= ceil (logarithm);
+  if (factorNums < (int) logarithm)
+    factorNums= (int) logarithm;
   // several bivariate factorizations
   for (int i= 0; i < factorNums; i++)

factory/facFqFactorize.h

@@ -27 +27 @@
 #include "facFqSquarefree.h"
 #include "facFqBivarUtil.h"
+
+extern const double log2exp;
 
 /// Factorization over a finite field