Changeset 93e7364 in git

Timestamp:

Mar 15, 2013, 3:19:20 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5e4636810908842f714d87ac378a9aa9c48ec33f

Parents:

d8a7daee3419d587cfa035cbf6890deb131d9e5f

git-author:

Martin Lee <martinlee84@web.de>2013-03-15 15:19:20+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-03-22 15:52:45+01:00

Message:

chg: compute minBound wrt different main variable

File:

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

factory/facFqBivar.cc

@@ -7615 +7615 @@
   }
 
+  int minBound= bounds[0];
+  for (int i= 1; i < boundsLength; i++)
+  {
+    if (bounds[i] != 0)
+      minBound= tmin (minBound, bounds[i]);
+  }
+
+  int boundsLength2;
+  int * bounds2= computeBoundsWrtDiffMainvar (A, boundsLength2, isIrreducible);
+  int minBound2= bounds2[0];
+  for (int i= 1; i < boundsLength2; i++)
+  {
+    if (bounds2[i] != 0)
+      minBound2= tmin (minBound2, bounds2[i]);
+  }
+
+
   bool fail= false;
   CanonicalForm Aeval, evaluation, bufAeval, bufEvaluation, buf, tmp;
@@ -7681 +7698 @@
                             swap, swap2, N);
       normalize (factors);
+      delete [] bounds;
+      delete [] bounds2;
       return factors;
     }
@@ -7723 +7742 @@
       if (!extension)
         normalize (factors);
+      delete [] bounds;
+      delete [] bounds2;
       return factors;
     }
@@ -7742 +7763 @@
           if (!extension)
             normalize (factors);
+          delete [] bounds;
+          delete [] bounds2;
           return factors;
         }
@@ -7760 +7783 @@
           if (!extension)
             normalize (factors);
+          delete [] bounds;
+          delete [] bounds2;
           return factors;
         }
@@ -7811 +7836 @@
   if (!derivXZero && !fail2 && !symmetric)
   {
-    if (uniFactors.length() > uniFactors2.length() ||
+    if ((uniFactors.length() > uniFactors2.length() && minBound2 <= minBound)||
         (uniFactors.length() == uniFactors2.length()
-         && degs.getLength() > degs2.getLength()))
+         && degs.getLength() > degs2.getLength() && minBound2 <= minBound))
     {
       degs= degs2;
@@ -7837 +7862 @@
     if (!extension)
       normalize (factors);
+    delete [] bounds;
+    delete [] bounds2;
     return factors;
   }
@@ -7843 +7870 @@
 
   if (swap2)
-    bounds= computeBounds (A, boundsLength, isIrreducible);
-
-  int minBound= bounds[0];
-  for (int i= 1; i < boundsLength; i++)
-  {
-    if (bounds[i] != 0)
-      minBound= tmin (minBound, bounds[i]);
+  {
+    delete [] bounds;
+    bounds= bounds2;
+    minBound= minBound2;
   }
 
@@ -8044 +8068 @@
       factors= earlyFactors;
   }
+
+  if (!swap2)
+    delete [] bounds2;
   delete [] bounds;
   if (!extension)