Changeset 3d6980b in git

Timestamp:

Jun 19, 2020, 4:22:49 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

bbec92425869780b8ebb03d87d31a00eabbfec85

Parents:

4c1fc06f2d81e12a8e75a5419444cb157fbe45e9

Message:

opt. factorize

Location:

factory

Files:

• NTLconvert.cc (modified) (1 diff)
• cf_factor.cc (modified) (7 diffs)

factory/NTLconvert.cc

@@ -769 +769 @@
   }
   // the multiplicity at pos 1
-  //if (!IsOne(multi))
-    result.insert(CFFactor(convertZZ2CF(multi),1));
+  result.insert(CFFactor(convertZZ2CF(multi),1));
 
   //return the converted list

factory/cf_factor.cc

@@ -478 +478 @@
 #ifdef HAVE_NTL
       {
-        // USE NTL
+        // use NTL
         if (fac_NTL_char != getCharacteristic())
         {
@@ -507 +507 @@
 #endif
     }
-    else
+    else // char p, multivariate
     {
       #if defined(HAVE_NTL)
@@ -563 +563 @@
         fmpz_poly_factor_clear (result);
         fmpz_poly_clear (f1);
-      }
-      if ( ! ic.isOne() )
-      {
-        if ( F.getFirst().factor().inCoeffDomain() )
+        if ( ! ic.isOne() )
         {
+           // according to convertFLINTfmpz_polyfactor2FcaCFFlist,
+           //  first entry is in CoeffDomain
           CFFactor new_first( F.getFirst().factor() * ic );
           F.removeFirst();
           F.insert( new_first );
         }
-        else
-          F.insert( CFFactor( ic ) );
       }
       goto end_char0;
       #elif defined(HAVE_NTL)
       {
-        //USE NTL
+        //use NTL
         ZZ c;
         vec_pair_ZZX_long factors;
@@ -586 +583 @@
         //convert the result back to Factory
         F=convertNTLvec_pair_ZZX_long2FacCFFList(factors,c,fz.mvar());
-      }
-      if ( ! ic.isOne() )
-      {
-        if ( F.getFirst().factor().inCoeffDomain() )
+        if ( ! ic.isOne() )
         {
+           // according to convertNTLvec_pair_ZZX_long2FacCFFList
+           //  first entry is in CoeffDomain
           CFFactor new_first( F.getFirst().factor() * ic );
           F.removeFirst();
-          F.insert( new_first );
-        }
-        else
-          F.insert( CFFactor( ic ) );
-      }
-      else
-      {
-        if ( !F.getFirst().factor().inCoeffDomain() )
-        {
-          CFFactor new_first( 1 );
           F.insert( new_first );
         }
@@ -612 +598 @@
       #endif
     }
-    else // not univariate,  char 0
+    else // multivariate,  char 0
     {
       On (SW_RATIONAL);
@@ -644 +630 @@
     if ( ! cd.isOne() )
     {
-      if ( F.getFirst().factor().inCoeffDomain() )
-      {
-        CFFactor new_first( F.getFirst().factor() / cd );
-        F.removeFirst();
-        F.insert( new_first );
-      }
-      else
-      {
-        F.insert( CFFactor( 1/cd ) );
-      }
+      CFFactor new_first( F.getFirst().factor() / cd );
+      F.removeFirst();
+      F.insert( new_first );
     }
   }
@@ -773 +752 @@
 #endif
 #if !defined(HAVE_NTL) && !defined(HAVE_FLINT)
-      factoryError ("univariate factorization  depends on NTL(missing)");
+      factoryError ("univariate factorization  depends on FLINT/NTL(missing)");
       return CFFList (CFFactor (f, 1));
-#endif //HAVE_NTL
-    }
-    else
+#endif
+    }
+    else // char p, multivariate
     {
       #ifdef HAVE_NTL