Changeset 34e062 in git for factory/facFqBivar.cc

Timestamp:

Jan 9, 2012, 1:59:20 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

a541144c391fb958d4c9ea1ac173dc1c117fb51f

Parents:

6fd83c451371ff612e9c1323bb1f472466b5933c

git-author:

Martin Lee <martinlee84@web.de>2012-01-09 13:59:20+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-10 14:16:44+01:00

Message:

chg: added functions to compute better lifting precisions
     based on the shape of the Newton polygon

File:

• factory/facFqBivar.cc (modified) (1 diff)

factory/facFqBivar.cc

@@ -780 +780 @@
 }
 
+int*
+getCombinations (int * rightSide, int sizeOfRightSide, int& sizeOfOutput,
+                 int degreeLC)
+{
+  Variable x= Variable (1);
+  int p= getCharacteristic();
+  int d= getGFDegree();
+  char cGFName= gf_name;
+  setCharacteristic(0);
+  CanonicalForm buf= 1;
+  for (int i= 0; i < sizeOfRightSide; i++)
+    buf *= (power (x, rightSide [i]) + 1);
+
+  int j= 0;
+  for (CFIterator i= buf; i.hasTerms(); i++, j++)
+  {
+    if (i.exp() < degreeLC)
+    {
+      j++;
+      break;
+    }
+  }
+
+  ASSERT ( j > 1, "j > 1 expected" );
+
+  int* result = new int  [j - 1];
+  sizeOfOutput= j - 1;
+
+  int i= 0;
+  for (CFIterator m = buf; i < j - 1; i++, m++)
+    result [i]= m.exp();
+
+  if (d > 1)
+    setCharacteristic (p, d, cGFName);
+  else
+    setCharacteristic (p);
+  return result;
+}
+
+int *
+getLiftPrecisions (const CanonicalForm& F, int& sizeOfOutput, int degreeLC)
+{
+  int sizeOfNewtonPoly;
+  int ** newtonPolyg= newtonPolygon (F, sizeOfNewtonPoly);
+  int sizeOfRightSide;
+  int * rightSide= getRightSide(newtonPolyg, sizeOfNewtonPoly, sizeOfRightSide);
+  int * result= getCombinations(rightSide, sizeOfRightSide, sizeOfOutput,
+                                degreeLC);
+  delete [] rightSide;
+  for (int i= 0; i < sizeOfNewtonPoly; i++)
+    delete [] newtonPolyg[i];
+  delete [] newtonPolyg;
+  return result;
+}
+
 CFList
 henselLiftAndEarly (CanonicalForm& A, bool& earlySuccess, CFList&