Changeset 070c1b4 in git for libfac/factor/Factor.cc

Timestamp:

Jul 9, 2012, 1:54:06 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

16055bd66cbe17a643cdc139b5ad13307053b068

Parents:

9e472371c48294d093be833766189740f0ddd8f0

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-07-09 13:54:06+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-08-03 10:03:18+02:00

Message:

fix: error about choosing field extensions (Tst/Short/bug_charseries2)

update version in libfac and factory

File:

• libfac/factor/Factor.cc (modified) (7 diffs)

libfac/factor/Factor.cc

@@ -27 +27 @@
 
 #include "alg_factor.h"
-void out_cf(char *s1,const CanonicalForm &f,char *s2);
+void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
 void out_cff(CFFList &L);
 
@@ -62 +62 @@
   else
   {
-    bool repl=(f.mvar() != alpha);
     //out_cf("f2 - factor:",f,"\n");
     //out_cf("f2 - ext:",alpha,"\n");
@@ -68 +67 @@
     Variable X=rootOf(mipo);
     CanonicalForm F=f;
-    if (repl) F=replacevar(f,alpha,X);
+    F=replacevar(f,alpha,X);
     //out_cf("call - factor:",F,"\n");
     //out_cf("call - ext:",X,"\n");
@@ -74 +73 @@
     CFFList L=factorize(F,X);
     CFFListIterator i=L;
-    if (repl)
     {
       CFFList Outputlist;
@@ -83 +81 @@
         i.getItem().exp()));
       }
+      //out_cff(Outputlist);
       return Outputlist;
     }
-    else return L;
   }
 }
@@ -466 +464 @@
 
 static int
-specializePoly(const CanonicalForm & f, Variable & Extension, int deg, SFormList & Substitutionlist, int i,int j){
+specializePoly(const CanonicalForm & f, Variable & Extension, int deg, SFormList & Substitutionlist, int i,int j)
+{
   Variable minpoly= Extension;
   int ok,extended= degree(Extension), working_over_extension;
@@ -475 +474 @@
   // First try:
   ok = try_specializePoly(f,minpoly,deg,Substitutionlist,i,j);
-  while ( ! ok ){ // we have to extend!
+  while ( ! ok ) // we have to extend!
+  {
+    SFormList origS=Substitutionlist;
     extended+= 1;
-    if ( ! working_over_extension ){
+    if ( ! working_over_extension )
+    {
       minpoly= rootOf(generate_mipo( extended,Extension ));
       Extension= minpoly;
       ok= try_specializePoly(f,minpoly,deg,Substitutionlist,i,j);
+      if (!ok)
+      {
+        Substitutionlist=origS;
+        // very bad hack: TODO
+        // we want to remove the newly created variable minpoly:
+        extern char *var_names_ext;
+        var_names_ext[strlen(var_names_ext)]='\0';
+      }
     }
     else