Changeset 617dbc in git for factory/facFqBivar.cc

Timestamp:

Jun 19, 2012, 3:16:35 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

53273d8bcb24900118b9a5adfd3b2e5353f82175

Parents:

773d281c087d1388ff04cd6c70faccb93fe0fc03

git-author:

Martin Lee <martinlee84@web.de>2012-06-19 15:16:35+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-07-31 11:48:49+02:00

Message:

chg: better reconstruction of symmetric polynomials

File:

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

factory/facFqBivar.cc

@@ -4259 +4259 @@
                                CanonicalForm& bufF, CFList& factors, int& l,
                                int& factorsFound, bool beenInThres, CFMatrix& M,
-                               CFArray& Pi, CFList& diophant
+                               CFArray& Pi, CFList& diophant, bool symmetric,
+                               const CanonicalForm& evaluation
                               )
 {
@@ -4329 +4330 @@
     while ((degree (F,y)/4)*i + 4 <= smallFactorDeg)
       i++;
-    while (i < 4)
-    {
-      dummy= tmin (degree (F,y)+1, (degree (F,y)/4)*(i+1)+4);
+    while (i < 5)
+    {
+      dummy= tmin (degree (F,y)+1, (degree (F,y)/4)*i+4);
       if (l < dummy)
       {
@@ -4337 +4338 @@
         henselLiftResume12 (F, factors, l, dummy, Pi, diophant, M);
         l= dummy;
+        if (i == 1 && degree (F)%4==0 && symmetric && factors.length() == 2 &&
+            LC (F,1).inCoeffDomain() &&
+           (degree (factors.getFirst(), 1) == degree (factors.getLast(),1)))
+        {
+          Variable x= Variable (1);
+          CanonicalForm g, h, gg, hh, multiplier1, multiplier2, check1, check2;
+          int m= degree (F)/4+1;
+          g= factors.getFirst();
+          h= factors.getLast();
+          g= mod (g, power (y,m));
+          h= mod (h, power (y,m));
+          g= g (y-evaluation, y);
+          h= h (y-evaluation, y);
+          gg= mod (swapvar (g,x,y),power (x,m));
+          gg= gg (y + evaluation, y);
+          multiplier1= factors.getLast()[m-1][0]/gg[m-1][0];
+          gg= div (gg, power (y,m));
+          gg= gg*power (y,m);
+          hh= mod (swapvar (h,x,y),power (x,m));
+          hh= hh (y + evaluation, y);
+          multiplier2= factors.getFirst()[m-1][0]/hh[m-1][0];
+          hh= div (hh, power (y,m));
+          hh= hh*power (y,m);
+          gg= multiplier1*gg+mod (factors.getLast(), power (y,m));
+          hh= multiplier2*hh+mod (factors.getFirst(), power (y,m));
+          check1= gg (y-evaluation,y);
+          check2= hh (y-evaluation,y);
+          check1= swapvar (check1, x, y);
+          if (check1/Lc (check1) == check2/Lc (check2))
+          {
+            result.append (gg);
+            result.append (hh);
+            delete [] liftPre;
+            delete [] factorsFoundIndex;
+            return result;
+          }
+        }
       }
       else
       {
         i++;
-        if (i < 4)
+        if (i < 5)
           continue;
       }
@@ -4435 +4473 @@
     while ((degree (F,y)/4)*i + 4 <= smallFactorDeg)
       i++;
-    while (i < 4)
-    {
-      dummy= tmin (degree (F,y)+1, (degree (F,y)/4)*(i+1)+4);
+    while (i < 5)
+    {
+      dummy= tmin (degree (F,y)+1, (degree (F,y)/4)*i+4);
       if (l < dummy)
       {
@@ -4447 +4485 @@
       {
         i++;
-        if (i < 4)
+        if (i < 5)
           continue;
       }
@@ -4546 +4584 @@
     while ((degree (F,y)/4)*i + 4 <= smallFactorDeg)
       i++;
-    while (i < 4)
-    {
-      dummy= tmin (degree (F,y)+1, (degree (F,y)/4)*(i+1)+4);
+    while (i < 5)
+    {
+      dummy= tmin (degree (F,y)+1, (degree (F,y)/4)*i+4);
       if (l < dummy)
       {
@@ -4558 +4596 @@
       {
         i++;
-        if (i < 4)
+        if (i < 5)
           continue;
       }
@@ -4675 +4713 @@
 CFList
 henselLiftAndLatticeRecombi (const CanonicalForm& G, const CFList& uniFactors,
-                             const Variable& alpha, const DegreePattern& degPat
+                             const Variable& alpha, const DegreePattern& degPat,
+                             bool symmetric, const CanonicalForm& evaluation
                             )
 {
@@ -5005 +5044 @@
     result= earlyReconstructionAndLifting (F, NTLN, bufF, bufUniFactors, l,
                                            factorsFound, beenInThres, M, Pi,
-                                           diophant
+                                           diophant, symmetric, evaluation
                                           );
 
@@ -5143 +5182 @@
     }
     return Union (result, henselLiftAndLatticeRecombi (bufF, bufUniFactors,
-                                                       alpha, degs
+                                                       alpha, degs, symmetric,
+                                                       evaluation
                                                       )
                  );
@@ -5273 +5313 @@
     delete [] bounds;
     return Union (result, henselLiftAndLatticeRecombi (F, bufUniFactors, alpha,
-                                                       degs
+                                                       degs,symmetric, evaluation
                                                       )
                  );
@@ -5933 +5973 @@
 
   bool fail= false;
-  CanonicalForm Aeval, evaluation, bufAeval, bufEvaluation, buf;
+  CanonicalForm Aeval, evaluation, bufAeval, bufEvaluation, buf, tmp;
   CFList uniFactors, list, bufUniFactors;
   DegreePattern degs;
@@ -5951 +5991 @@
   int subCheck1= substituteCheck (A, x);
   int subCheck2= substituteCheck (A, y);
+  bool symmetric= false;
   for (int i= 0; i < factorNums; i++)
   {
@@ -5957 +5998 @@
     if (!derivXZero && !fail2)
     {
-      buf= swapvar (A, x, y);
+      if (i == 0)
+      {
+        buf= swapvar (A, x, y);
+        symmetric= (A/Lc (A) == buf/Lc (buf));
+      }
       bufAeval2= buf;
       bufEvaluation2= evalPoint (buf, bufAeval2, alpha, list2, GF, fail2);
@@ -5970 +6015 @@
         subCheck2= subCheck1;
         subCheck1= dummy;
+        tmp= A;
         A= buf;
+        buf= tmp;
         bufAeval= bufAeval2;
         swap2= true;
@@ -6200 +6247 @@
     else if (alpha.level() == 1 && !GF)
     {
-      CFList lll= henselLiftAndLatticeRecombi (A, uniFactors, alpha, degs);
+      CFList lll= henselLiftAndLatticeRecombi (A, uniFactors, alpha, degs, 
+                                               symmetric, evaluation);
       factors= Union (lll, factors);
     }
     else if (!extension && (alpha != x || GF))
     {
-      CFList lll= henselLiftAndLatticeRecombi (A, uniFactors, alpha, degs);
+      CFList lll= henselLiftAndLatticeRecombi (A, uniFactors, alpha, degs,
+                                               symmetric, evaluation);
       factors= Union (lll, factors);
     }