Changeset c49e6f in git for factory/facFqBivar.cc

Timestamp:

Nov 29, 2012, 10:50:23 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

fd806709d80df10779e64d6bfe77cdf372b9c004

Parents:

894604cd8e2bd80d9c29cfc35d194404eaa0d476

git-author:

Martin Lee <martinlee84@web.de>2012-11-29 10:50:23+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-11-30 17:25:20+01:00

Message:

fix: several fixes for factorization if extension needed

File:

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

factory/facFqBivar.cc

@@ -412 +412 @@
                 if (recombination)
                 {
-                  appendTestMapDown (result, buf (y - eval, y), info, source,
+                  buf= buf (y-eval,y);
+                  buf /= Lc (buf);
+                  appendTestMapDown (result, buf, info, source,
                                       dest);
                   F= 1;
@@ -439 +441 @@
       if (recombination)
       {
-        appendTestMapDown (result, buf (y - eval, y), info, source, dest);
+        buf= buf (y-eval,y);
+        buf /= Lc (buf);
+        appendTestMapDown (result, buf, info, source, dest);
         F= 1;
         return result;
@@ -1788 +1792 @@
     buf /= content (buf, x);
     buf2= buf (y-evaluation, y);
+    buf2 /= Lc (buf2);
     if (!k && beta == x)
     {
@@ -1868 +1873 @@
     buf /= content (buf, x);
     buf2= buf (y-evaluation, y);
+    buf2 /= Lc (buf2);
     if (!k && beta == x)
     {
@@ -2043 +2049 @@
       tmp1= tmp1 (y - evaluation, y);
       tmp2= tmp2 (y - evaluation, y);
+      tmp1 /= Lc (tmp1);
+      tmp2 /= Lc (tmp2);
       if (!k && beta == x && degree (tmp2, alpha) < 1 &&
           degree (tmp1, alpha) < 1)
@@ -2097 +2105 @@
     buf /= content (buf, x);
     buf2= buf (y - evaluation, y);
+    buf2 /= Lc (buf2);
     if (!k && beta == x)
     {
@@ -2172 +2181 @@
       tmp1= tmp1 (y - evaluation, y);
       tmp2= tmp2 (y - evaluation, y);
+      tmp1 /= Lc (tmp1);
+      tmp2 /= Lc (tmp2);
       if (!k && beta == x && degree (tmp2, alpha) < 1 &&
           degree (tmp1, alpha) < 1)
@@ -2226 +2237 @@
     buf /= content (buf, x);
     buf2= buf (y - evaluation, y);
+    buf2 /= Lc (buf2);
     if (!k && beta == x)
     {
@@ -3572 +3584 @@
   {
     delete [] bounds;
-    CanonicalForm G= F;
+    Variable y= Variable (2);
+    CanonicalForm tmp= F (y - evaluation, y);
+    CFList source, dest;
+    tmp= mapDown (tmp, info, source, dest);
     F= 1;
-    return CFList (G);
+    return CFList (tmp);
   }
 
@@ -5679 +5694 @@
   {
     i= 1;
-    while ((degree (F,y)/4)*i + 4 <= smallFactorDeg)
+    while (((degree (F,y)/4)*i+1) + 4 <= smallFactorDeg)
       i++;
     while (i < 5)
     {
-      dummy= tmin (degree (F,y)+1, (degree (F,y)/4)*i+4);
+      dummy= tmin (degree (F,y)+1, ((degree (F,y)/4)+1)*i+4);
       if (l < dummy)
       {
@@ -5838 +5853 @@
   {
     i= 1;
-    while ((degree (F,y)/4)*i + 4 <= smallFactorDeg)
+    while ((degree (F,y)/4+1)*i + 4 <= smallFactorDeg)
       i++;
     while (i < 5)
     {
-      dummy= tmin (degree (F,y)+1, (degree (F,y)/4)*i+4);
+      dummy= tmin (degree (F,y)+1, (degree (F,y)/4+1)*i+4);
       if (l < dummy)
       {
@@ -5986 +6001 @@
   {
     i= 1;
-    while ((degree (F,y)/4)*i + 4 <= smallFactorDeg)
+    while ((degree (F,y)/4+1)*i + 4 <= smallFactorDeg)
       i++;
     while (i < 5)
     {
-      dummy= tmin (degree (F,y)+1, (degree (F,y)/4)*i+4);
+      dummy= tmin (degree (F,y)+1, (degree (F,y)/4+1)*i+4);
       if (l < dummy)
       {
@@ -7330 +7345 @@
     if (degs.getLength() == 1 || bufUniFactors.length() == 1)
     {
-      result.append (bufF);
+      CFList source, dest;
+      CanonicalForm tmp= bufF (y - evaluation, y);
+      tmp= mapDown (tmp, info, source, dest);
+      result.append (tmp);
       return result;
     }
@@ -7687 +7705 @@
     }
 
-    if (i == 0)
+    if (i == 0 && !extension)
     {
       if (subCheck1 > 0)