Changeset 070c1b4 in git

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

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

Files:

• factory/variable.cc (modified) (1 diff)
• libfac/charset/alg_factor.cc (modified) (1 diff)
• libfac/configure (modified) (2 diffs)
• libfac/configure.in (modified) (1 diff)
• libfac/factor/Factor.cc (modified) (7 diffs)

factory/variable.cc

@@ -39 +39 @@
 static ext_entry * algextensions = 0;
 static char * var_names = 0;
-static char * var_names_ext = 0;
+       char * var_names_ext = 0;
 static char default_name = 'v';
 static char default_name_ext = 'a';

libfac/charset/alg_factor.cc

@@ -18 +18 @@
 #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);
 
 #ifdef ALGFACTORDEBUG

libfac/configure

@@ -530 +530 @@
 libfac_name="\"Factorization and characteristic sets library\""
 
-libfac_version="3.1.3"
+libfac_version="3.1.5"
 cat >> confdefs.h <<EOF
 #define LIBFAC_VERSION "$libfac_version"
@@ -536 +536 @@
 
 
-libfac_date="\"March 2011\""
+libfac_date="\"July 2012\""
 cat >> confdefs.h <<EOF
 #define LIBFAC_DATE $libfac_date

libfac/configure.in

@@ -15 +15 @@
 libfac_name="\"Factorization and characteristic sets library\""
 AC_SUBST(libfac_name)
-libfac_version="3.1.3"
+libfac_version="3.1.5"
 AC_DEFINE_UNQUOTED(LIBFAC_VERSION,"$libfac_version")
 AC_SUBST(libfac_version)
-libfac_date="\"March 2011\""
+libfac_date="\"July 2012\""
 AC_DEFINE_UNQUOTED(LIBFAC_DATE,$libfac_date)
 AC_SUBST(libfac_date)

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