Changeset 863b03 in git

Timestamp:

Mar 17, 2014, 8:35:01 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9c9ed172d6031851741d232b305ae98555a7d88f

Parents:

789a7e93154cff0756258fc1aea3331cb78f20a8

git-author:

Martin Lee <martinlee84@web.de>2014-03-17 20:35:01+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-03-18 12:02:41+01:00

Message:

fix: handling of SW_RATIONAL

File:

• factory/libfac/charset/alg_factor.cc (modified) (10 diffs)

factory/libfac/charset/alg_factor.cc

@@ -1030 +1030 @@
 newfactoras( const CanonicalForm & f, const CFList & as, int &success)
 {
+  bool isRat= isOn (SW_RATIONAL);
+  if (!isRat)
+    On (SW_RATIONAL);
   Variable vf=f.mvar();
   CFListIterator i;
@@ -1050 +1053 @@
 // ||( (as.length()==1) && (degree(f,vf)==3) && (degree(as.getFirst()==2)) )
     DEBDECLEVEL(CERR,"newfactoras");
+    if (!isRat)
+      Off (SW_RATIONAL);
     return CFFList(CFFactor(f,1));
   }
@@ -1079 +1084 @@
   if ( Astar.length() == 0 ){
     DEBDECLEVEL(CERR,"newfactoras");
+    if (!isRat)
+      Off (SW_RATIONAL);
     return CFFList(CFFactor(f,1));
   }
@@ -1110 +1117 @@
       CFFList result= newfactoras (Ggcd,as,success); //Ggcd is the squarefree part of f
       multiplicity (result, f, Astar);
+      if (!isRat)
+        Off (SW_RATIONAL);
       return result;
     }
@@ -1116 +1125 @@
     Fgcd= pp(Fgcd); Ggcd= pp(Ggcd);
     DEBDECLEVEL(CERR,"newfactoras");
+    if (!isRat)
+      Off (SW_RATIONAL);
     return myUnion(newfactoras(Fgcd,as,success) , newfactoras(Ggcd,as,success));
   }
   if ( getCharacteristic() > 0 )
   {
+    if (!isRat)
+      Off (SW_RATIONAL);
     // First look for extension!
     IntList degreelist;
@@ -1164 +1177 @@
     Variable vminpoly;
     Factorlist= alg_factor(f, Astar, vminpoly, oldord, as, isFunctionField);
-      DEBDECLEVEL(CERR,"newfactoras");
-      return Factorlist;
+    DEBDECLEVEL(CERR,"newfactoras");
+    if (!isRat)
+      Off (SW_RATIONAL);
+    return Factorlist;
   }
 
@@ -1175 +1190 @@
 newcfactor(const CanonicalForm & f, const CFList & as, int & success )
 {
-  On (SW_RATIONAL);
+  bool isRat= isOn (SW_RATIONAL);
+  if (!isRat)
+    On (SW_RATIONAL);
   CFFList Output, output, Factors= factorize(f);
   if (Factors.getFirst().factor().inCoeffDomain())
@@ -1182 +1199 @@
   if ( as.length() == 0 )
   {
+    if (!isRat)
+      Off (SW_RATIONAL);
     success=1;
     return Factors;
@@ -1187 +1206 @@
   if ( cls(f) <= cls(as.getLast()) )
   {
+    if (!isRat)
+      Off (SW_RATIONAL);
     success=1;
     return Factors;
@@ -1198 +1219 @@
       Output = myappend(Output,CFFactor(j.getItem().factor(),j.getItem().exp()*i.getItem().exp()));
   }
+
+  if (!isRat)
+    Off (SW_RATIONAL);
   return Output;
 }