Changeset 15d30a in git for factory

Timestamp:

Oct 19, 2020, 6:12:22 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

012949462a7c92b1b3ea0e09d6d70bccb9c49c2a

Parents:

69023a14c236753eaa4d47d50a8e822f8b95ebe4

Message:

factorize: re-struct

File:

• factory/cf_factor.cc (modified) (1 diff)

factory/cf_factor.cc

@@ -616 +616 @@
     else // multivariate,  char 0
     {
+      #ifdef HAVE_NTL
+      On (SW_RATIONAL);
       if (issqrfree)
       {
-        #ifdef HAVE_NTL
-        On (SW_RATIONAL);
         CFList factors= ratSqrfFactorize (fz);
         for (CFListIterator i= factors; i.hasItem(); i++)
           F.append (CFFactor (i.getItem(), 1));
-        #else
-        F=ZFactorizeMultivariate(fz, issqrfree);
-        #endif
       }
       else
       {
-        #ifdef HAVE_NTL
-        On (SW_RATIONAL);
         F = ratFactorize (fz);
-        #else
-        F=ZFactorizeMultivariate(fz, issqrfree);
-        #endif
-      }
+      }
+      #else
+      F=ZFactorizeMultivariate(fz, issqrfree);
+      #endif
     }