Changeset 3c25c9 in git

Timestamp:

Apr 23, 2012, 4:58:13 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

6f8d6f9137c56e72b78c6ae9c87f1d0d5e77bb97

Parents:

9127ccb90083f98a048e3f5e25884a44dd454af9

git-author:

Martin Lee <martinlee84@web.de>2012-04-23 16:58:13+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-04-24 16:07:29+02:00

Message:

chg: more trivial checks

Location:

factory

Files:

• facBivar.cc (modified) (1 diff)
• facFqBivar.cc (modified) (3 diffs)
• facFqBivar.h (modified) (1 diff)

factory/facBivar.cc

@@ -426 +426 @@
 
   //check trivial case
-  if (degree (A) == 1 || degree (A, 1) == 1)
+  if (degree (A) == 1 || degree (A, 1) == 1 ||
+      (size (A) == 2 && gcd (degree (A), degree (A,1)).isOne()))
   {
     CFList factors;

factory/facFqBivar.cc

@@ -5683 +5683 @@
   }
 
+  
   //check trivial case
-  if (degree (A) == 1 || degree (A, 1) == 1)
+  if (degree (A) == 1 || degree (A, 1) == 1 || 
+      (size (A) == 2 && gcd (degree (A), degree (A,1)).isOne()))
   {
     factors.append (A);
@@ -5961 +5963 @@
   }
 
-  A= A (y + evaluation, y);
-
   int liftBound= degree (A, y) + 1;
 
   int boundsLength;
-  int * bounds= computeBounds (A (y - evaluation, y), boundsLength);
+  int * bounds= computeBounds (A, boundsLength);
   int minBound= bounds[0];
   for (int i= 1; i < boundsLength; i++)
@@ -5973 +5973 @@
       minBound= tmin (minBound, bounds[i]);
   }
+
+  A= A (y + evaluation, y);
 
   int degMipo= 1;

factory/facFqBivar.h

@@ -398 +398 @@
   mat_ZZ M;
   vec_ZZ S;
-  CanonicalForm oldF= F;
   F= compress (F, M, S);
   CanonicalForm pthRoot, A, tmp;