Changeset b86107 in git for factory/libfac/factor/Factor.cc

Timestamp:

Aug 3, 2012, 1:00:23 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c10f46e6c7991d296a0430998c801a958c5f4036

Parents:

4093f96acfcc6419c56ee983c447099c3b87a36e2d71dd455de206f556c8c2200d3bc739a4a48ebb

Message:

Merge pull request #163 from mmklee/libfac_fix_sw

Libfac fix sw

File:

• factory/libfac/factor/Factor.cc (modified) (11 diffs)

factory/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);
 
@@ -52 +52 @@
 * ( in factorize, alpha.level() must be < 0 )
 */
+static
 CFFList factorize2 ( const CanonicalForm & f,
                      const Variable & alpha, const CanonicalForm & mipo )
@@ -61 +62 @@
   else
   {
-    bool repl=(f.mvar() != alpha);
     //out_cf("f2 - factor:",f,"\n");
     //out_cf("f2 - ext:",alpha,"\n");
@@ -67 +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");
@@ -73 +73 @@
     CFFList L=factorize(F,X);
     CFFListIterator i=L;
-    if (repl)
     {
       CFFList Outputlist;
@@ -82 +81 @@
         i.getItem().exp()));
       }
+      //out_cff(Outputlist);
       return Outputlist;
     }
-    else return L;
   }
 }
@@ -393 +392 @@
 generate_mipo( int degree_of_Extension , const Variable & Extension ){
   FFRandom gen;
-  if ( degree(Extension) > 0 ) GFRandom gen;
-  else {
-    if ( degree(Extension) == 0 ) FFRandom gen;
-    else
-    {
-      factoryError("libfac: evaluate: Extension not inFF() or inGF() !");
-    }
-  }
+  if (degree (Extension) < 0)
+    factoryError("libfac: evaluate: Extension not inFF() or inGF() !");
   return find_irreducible( degree_of_Extension, gen, Variable(1) );
 }
@@ -465 +458 @@
 
 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;
@@ -474 +468 @@
   // 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 ){
-      minpoly= rootOf(generate_mipo( extended,Extension ));
+    if ( ! working_over_extension )
+    {
+      if (!hasMipo(Extension))
+        minpoly= rootOf (generate_mipo (extended, Extension));
+      else
+      {
+        setReduce (Extension, false);
+        setMipo (minpoly, generate_mipo ( extended, Extension));
+        setReduce (Extension, true);
+      }
       Extension= minpoly;
       ok= try_specializePoly(f,minpoly,deg,Substitutionlist,i,j);
+      if (!ok)
+        Substitutionlist=origS;
     }
     else
@@ -804 +810 @@
 {
   //out_cf("Factorize ",F,"\n");
-  CFFList Outputlist,SqrFreeList,Intermediatelist,Outputlist2;
-  ListIterator<CFFactor> i,j;
-  CanonicalForm g=1,unit=1,r=1;
-  Variable minpoly; // dummy
-  int exp;
-  CFMap m;
+  CFFList Outputlist;
 
   // INTERRUPTHANDLER
@@ -831 +832 @@
     return Outputlist;
   }
+  CFFList SqrFreeList,Intermediatelist,Outputlist2;
+  ListIterator<CFFactor> i,j;
+  CanonicalForm g=1,unit=1,r=1;
+  Variable minpoly; // dummy
+  int exp;
+  CFMap m;
   TIMING_START(factorize_time);
   // search an "optimal" main variavble