Changeset 21263cf in git

Timestamp:

Aug 1, 2012, 5:56:22 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

18368851c078420078f8f9bd4ca3c74977a6c3a8

Parents:

5ab7d6cc38ed01ca8113b42dcf789145642047c0

git-author:

Martin Lee <martinlee84@web.de>2012-08-01 17:56:22+02:00

git-committer:

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

Message:

chg: replaced hack by setMipo

File:

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

factory/libfac/factor/Factor.cc

@@ -392 +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) );
 }
@@ -480 +474 @@
     if ( ! working_over_extension )
     {
-      minpoly= rootOf(generate_mipo( extended,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;
-        // 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