Changeset edd818 in git

Timestamp:

May 4, 2012, 11:14:01 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

18a66064a9a8616bef22907b60e68633bfc80c55

Parents:

dccd6db99cc44c93669e843ddb6e06d2682769b8

git-author:

Martin Lee <martinlee84@web.de>2012-05-04 23:14:01+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-05-07 18:18:44+02:00

Message:

fix: do not add lead coeff to factorization if it's 1
fix: do not compute factorization twice

Location:

factory

Files:

• FLINTconvert.cc (modified) (1 diff)
• cf_factor.cc (modified) (3 diffs)

factory/FLINTconvert.cc

@@ -265 +265 @@
 {
   CFFList result;
-  result.insert (CFFactor (CanonicalForm ((long) leadingCoeff), 1));
+  if (leadingCoeff != 1)
+    result.insert (CFFactor (CanonicalForm ((long) leadingCoeff), 1));
 
   long i;

factory/cf_factor.cc

@@ -441 +441 @@
       F= convertFLINTnmod_poly_factor2FacCFFList (result, leadingCoeff, f.mvar());
       nmod_poly_factor_clear (result);
+      nmod_poly_clear (f1);
 #else
 #ifdef HAVE_NTL
@@ -542 +543 @@
       else
 #endif //HAVE_NTL
-#endif //HAVE_FLINT
       {  // Use Factory without NTL
         if ( isOn( SW_BERLEKAMP ) )
@@ -549 +549 @@
           F=FpFactorizeUnivariateCZ( f, issqrfree, 0, Variable(), Variable() );
       }
+#endif //HAVE_FLINT
     }
     else