Changeset 23f3c87 in git

Timestamp:

Jun 2, 2014, 12:18:15 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6e4bb02f0a7a82f90f9ed86e463736bad0637b46

Parents:

3056723f8ded0bf113146118e3fddcb035d965b2

git-author:

Martin Lee <martinlee84@web.de>2014-06-02 12:18:15+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-06-04 11:54:57+02:00

Message:

chg: refactor SteelTrager

File:

• factory/facAlgFunc.cc (modified) (4 diffs)

factory/facAlgFunc.cc

@@ -599 +599 @@
 }
 
-/// algorithm of A. Steel described in "Conquering Inseparability: Primary
-/// decomposition and multivariate factorization over algebraic function fields
-/// of positive characteristic" with the following modifications: we use
-/// characteristic sets in IdealOverSubfield and Trager's primitive element
-/// algorithm instead of FGLM
-CFFList
-SteelTrager (const CanonicalForm & f, const CFList & AS)
+
+/// map elements in AS into a PIE L and record where the variables are mapped to
+/// in varsMapLevel, i.e varsMapLevel contains a list of pairs of variables
+/// $v_i$ and integers $e_i$ such that
+/// $L=K(\sqrt[p^{e_1}]{v_1}, \ldots, \sqrt[p^{e_n}]{v_n})$
+CFList
+mapIntoPIE (CFFList& varsMapLevel, CanonicalForm& lcmVars, const CFList & AS)
 {
-  CanonicalForm F= f, lcmVars= 1;
+  CanonicalForm varsG;
+  int j, exp= 0, tmpExp;
+  bool recurse= false;
   CFList asnew, as= AS;
-  CFListIterator i, ii;
-
-  bool derivZeroF= false;
-  int j, exp=0, expF= 0, tmpExp;
-  CFFList varsMapLevel;
+  CFListIterator i= as, ii;
+  CFFList varsGMapLevel, tmp;
   CFFListIterator iter;
-
-  // check if F is separable
-  if (F.deriv().isZero())
-  {
-    derivZeroF= true;
-    deflateDegree (F, expF, F.level());
-  }
-
-  CanonicalForm varsF= getVars (F);
-  varsF /= F.mvar();
-
-  lcmVars= lcm (varsF, lcmVars);
-
-  if (derivZeroF)
-    as.append (F);
-
-  CFFList varsGMapLevel;
-  CFFList tmp;
   CFFList * varsGMap= new CFFList [as.length()];
   for (j= 0; j < as.length(); j++)
     varsGMap[j]= CFFList();
-
-  CanonicalForm varsG;
   j= 0;
-  bool recurse= false;
-  i= as;
-  // make minimal polys and F separable
   while (i.hasItem())
   {
@@ -648 +624 @@
       deflateDegree (i.getItem(), exp, i.getItem().level());
       i.getItem()= deflatePoly (i.getItem(), exp, i.getItem().level());
-     
+
       varsG= getVars (i.getItem());
       varsG /= i.getItem().mvar();
@@ -750 +726 @@
   }
 
-  // compute how to map variables in F
   for (j= 0; j < as.length(); j++)
   {
@@ -771 +746 @@
   delete [] varsGMap;
 
+  return asnew;
+}
+
+/// algorithm of A. Steel described in "Conquering Inseparability: Primary
+/// decomposition and multivariate factorization over algebraic function fields
+/// of positive characteristic" with the following modifications: we use
+/// characteristic sets in IdealOverSubfield and Trager's primitive element
+/// algorithm instead of FGLM
+CFFList
+SteelTrager (const CanonicalForm & f, const CFList & AS)
+{
+  CanonicalForm F= f, lcmVars= 1;
+  CFList asnew, as= AS;
+  CFListIterator i, ii;
+
+  bool derivZeroF= false;
+  int j, expF= 0, tmpExp;
+  CFFList varsMapLevel, tmp;
+  CFFListIterator iter;
+
+  // check if F is separable
+  if (F.deriv().isZero())
+  {
+    derivZeroF= true;
+    deflateDegree (F, expF, F.level());
+  }
+
+  CanonicalForm varsF= getVars (F);
+  varsF /= F.mvar();
+
+  lcmVars= lcm (varsF, lcmVars);
+
   if (derivZeroF)
-  {
-    as.removeLast();
+    as.append (F);
+
+  asnew= mapIntoPIE (varsMapLevel, lcmVars, as);
+
+  if (derivZeroF)
+  {
     asnew.removeLast();
     F= deflatePoly (F, expF, F.level());