Changeset 2fbb9e6 in git for factory

Timestamp:

Mar 6, 2012, 10:35:56 AM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4e6d2aac480d2946ef572d24bd5dd72906cf1e57

Parents:

51aa1628bc6d045fbc3a9adf018acd4371a09596

git-author:

Martin Lee <martinlee84@web.de>2012-03-06 10:35:56+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:26+02:00

Message:

chg: make minimal polynomial an element of Z[t]

File:

• factory/facBivar.h (modified) (2 diffs)

factory/facBivar.h

@@ -83 +83 @@
   vec_ZZ S;
   F= compress (F, M, S);
-  CFList result= biFactorize (F, v);
-  for (CFListIterator i= result; i.hasItem(); i++)
-    i.getItem()= N (decompress (i.getItem(), M, S));
+  Variable tmp1, tmp2;
+  CanonicalForm mipoTmp1;
+  bool substAlgVar= false;
+  if (v.level() != 1)
+  {
+    mipoTmp1= getMipo (v);
+    if (!bCommonDen (getMipo (v)).isOne())
+    {
+      tmp2= v;
+      mipoTmp1 *= bCommonDen (mipoTmp1);
+      mipoTmp1= replacevar (mipoTmp1, v, Variable (1));
+      tmp1= rootOf (mipoTmp1);
+      F= replacevar (F, tmp2, tmp1);
+      substAlgVar= true;
+    }
+    else
+      tmp1= v;
+  }
+  else
+    tmp1= v;
+  CFList result= biFactorize (F, tmp1);
+  if (substAlgVar)
+  {
+    for (CFListIterator i= result; i.hasItem(); i++)
+      i.getItem()= N (decompress (replacevar (i.getItem(), tmp1, tmp2), M, S));
+  }
+  else
+  {
+    for (CFListIterator i= result; i.hasItem(); i++)
+      i.getItem()= N (decompress (i.getItem(), M, S));
+  }
   for (CFFListIterator i= contentXFactors; i.hasItem(); i++)
     result.append (N(i.getItem().factor()));
@@ -188 +216 @@
   vec_ZZ S;
   F= compress (F, M, S);
+  Variable tmp1, tmp2;
+  CanonicalForm mipoTmp1;
+  bool substAlgVar= false;
+  if (v.level() != 1)
+  {
+    mipoTmp1= getMipo (v);
+    if (!bCommonDen (getMipo (v)).isOne())
+    {
+      tmp2= v;
+      mipoTmp1 *= bCommonDen (mipoTmp1);
+      mipoTmp1= replacevar (mipoTmp1, v, Variable (1));
+      tmp1= rootOf (mipoTmp1);
+      F= replacevar (F, tmp2, tmp1);
+      substAlgVar= true;
+    }
+    else
+      tmp1= v;
+  }
+  else
+    tmp1= v;
   CFFList sqrfFactors= sqrFree (F);
   for (CFFListIterator i= sqrfFactors; i.hasItem(); i++)
   {
-    CFList tmp= ratBiSqrfFactorize (i.getItem().factor(), v);
-    for (CFListIterator j= tmp; j.hasItem(); j++)
-    {
-      if (j.getItem().inCoeffDomain()) continue;
-      result.append (CFFactor (N (decompress (j.getItem(), M, S)), i.getItem().exp()));
+    CFList tmp= ratBiSqrfFactorize (i.getItem().factor(), tmp1);
+    if (substAlgVar)
+    {
+      for (CFListIterator j= tmp; j.hasItem(); j++)
+      {
+        if (j.getItem().inCoeffDomain()) continue;
+        result.append (CFFactor (N (decompress (replacevar (j.getItem(),
+                                 tmp1, tmp2), M, S)), i.getItem().exp()));
+      }
+    }
+    else
+    {
+      for (CFListIterator j= tmp; j.hasItem(); j++)
+      {
+        if (j.getItem().inCoeffDomain()) continue;
+        result.append (CFFactor (N (decompress (j.getItem(), M, S)),
+                                 i.getItem().exp()));
+      }
     }
   }