Changeset 327efa2 in git for factory/facFactorize.cc

Timestamp:

Sep 14, 2011, 2:38:38 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

09723d9937585aae280f53597c2c61b2b3e6304a

Parents:

725e6002e0b07ad1474e14f72296c0c85a47ae4d

Message:

different lifting  in precomputeLeadingCoeff
extend henselLift122 to lift more than two factors


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

File:

• factory/facFactorize.cc (modified) (3 diffs)

factory/facFactorize.cc

@@ -202 +202 @@
       for (iter= bufSqrfFactors [i]; iter.hasItem(); iter++)
       {
+        if (iter.getItem().factor().inCoeffDomain())
+          continue;
         iter.getItem()= CFFactor (iter.getItem().factor()/
                                   Lc (iter.getItem().factor()),
@@ -212 +214 @@
       for (iter= bufSqrfFactors [i]; iter.hasItem(); iter++)
       {
+        if (iter.getItem().factor().inCoeffDomain())
+          continue;
         iter.getItem()= CFFactor (iter.getItem().factor()/
                                Lc (iter.getItem().factor()),
@@ -388 +392 @@
     factors= bufFactors;
 
-  int liftBound= degree (sqrfPartF,2) + degree (LC (sqrfPartF, 1), 2) + 1;
-
-  int* liftBounds= liftingBounds (sqrfPartF, liftBound);
 
   bufFactors= factors;
-  factors.insert (LC (evalSqrfPartF.getFirst(), 1));
-  CFMatrix M= CFMatrix (liftBound, factors.length() - 1);
-  CFArray Pi;
-  CFList diophant;
-  henselLift12 (evalSqrfPartF.getFirst(), factors, liftBound, Pi, diophant, M,
-                false);
-
-  if (sqrfPartF.level() > 2)
-    factors= henselLift (evalSqrfPartF, factors, liftBounds,
-                         sqrfPartF.level() - 1, false);
-
-  CFList MOD;
-  for (int i= 0; i < sqrfPartF.level() - 1; i++)
-    MOD.append (power (Variable (i + 2), liftBounds [i]));
-
-  CFList interMedResult= leadingCoeffReconstruction (evalSqrfPartF.getLast(),
-                                                     factors, MOD);
+
+  if (factors.length() > 1)
+  {
+    CanonicalForm LC1= LC (evalSqrfPartF.getFirst(), 1);
+
+    CFArray leadingCoeffs= CFArray (factors.length());
+    for (int i= 0; i < factors.length(); i++)
+      leadingCoeffs[i]= LC1;
+    for (CFListIterator i= factors; i.hasItem(); i++)
+      i.getItem() *= LC1 (0,2)/Lc (i.getItem());
+    factors.insert (1);
+
+    CanonicalForm
+    newSqrfPartF= evalSqrfPartF.getFirst()*power (LC1, factors.length() - 2);
+
+    int liftBound= degree (newSqrfPartF,2) + 1;
+
+    CFMatrix M= CFMatrix (liftBound, factors.length() - 1);
+    CFArray Pi;
+    CFList diophant;
+    henselLift122 (newSqrfPartF, factors, liftBound, Pi, diophant, M,
+                   leadingCoeffs, false);
+
+    if (sqrfPartF.level() > 2)
+    {
+      int* liftBounds= new int [sqrfPartF.level() - 1];
+      liftBounds [0]= liftBound;
+      bool noOneToOne= false;
+      CFList *leadingCoeffs2= new CFList [sqrfPartF.level()-2];
+      LC1= LC (evalSqrfPartF.getLast(), 1);
+      CFList LCs;
+      for (int i= 0; i < factors.length(); i++)
+        LCs.append (LC1);
+      leadingCoeffs2 [sqrfPartF.level() - 3]= LCs;
+      for (int i= sqrfPartF.level() - 1; i > 2; i--)
+      {
+        for (CFListIterator j= LCs; j.hasItem(); j++)
+          j.getItem()= j.getItem() (0, i + 1);
+        leadingCoeffs2 [i - 3]= LCs;
+      }
+      sqrfPartF= sqrfPartF*power (LC1, factors.length()-1);
+
+      int liftBoundsLength= sqrfPartF.level() - 1;
+      for (int i= 1; i < liftBoundsLength; i++)
+        liftBounds [i]= degree (sqrfPartF, i + 2) + 1;
+      evalSqrfPartF= evaluateAtZero (sqrfPartF);
+      evalSqrfPartF.removeFirst();
+      factors= nonMonicHenselLift (evalSqrfPartF, factors, leadingCoeffs2,
+               diophant, Pi, liftBounds, sqrfPartF.level() - 1, noOneToOne);
+      delete [] leadingCoeffs2;
+      delete [] liftBounds;
+    }
+  }
+  else
+    factors= evalSqrfPartF.getLast();
+
+  CFList interMedResult= recoverFactors (evalSqrfPartF.getLast(), factors);
 
   CFList result;