Changeset c8302b in git

Timestamp:

May 9, 2012, 10:52:48 AM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

75f10d0ac85a8bbe7d3c995ee023d8aaaf4a6c9b

Parents:

5c0bf0e51f96eb0ce4f2b693d76e67b7ab513d4e68a3479934a843315e00106eafa5f39066a82124

Message:

Merge pull request #103 from mmklee/factory_fixes_sw

Factory fixes sw

Files:

• factory/DegreePattern.cc (modified) (1 diff)
• factory/FLINTconvert.cc (modified) (1 diff)
• factory/cfNewtonPolygon.cc (modified) (1 diff)
• factory/cf_factor.cc (modified) (3 diffs)
• factory/cf_gcd_smallp.cc (modified) (11 diffs)
• factory/facFactorize.cc (modified) (1 diff)
• factory/facFqBivar.cc (modified) (26 diffs)
• factory/facFqBivarUtil.cc (modified) (2 diffs)
• factory/facFqFactorize.cc (modified) (1 diff)
• factory/facMul.cc (modified) (6 diffs)
• libpolys/polys/clapsing.cc (modified) (1 diff)

factory/DegreePattern.cc

@@ -34 +34 @@
   int p= getCharacteristic();
   int d= 0;
-  char cGFName;
+  char cGFName= 'Z';
   if (CFFactory::gettype() == GaloisFieldDomain)
   {

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/cfNewtonPolygon.cc

@@ -601 +601 @@
 {
   int n;
-  int ** newtonPolyg;
+  int ** newtonPolyg= NULL;
   if (computeMA)
   {

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

factory/cf_gcd_smallp.cc

@@ -1596 +1596 @@
   bool fail= false;
   bool inextension= false;
-  bool inextensionextension= false;
-  bool topLevel2= false;
+  topLevel= false;
   CFList source, dest;
   int bound1= degree (ppA, 1);
@@ -1614 +1613 @@
       G_random_element=
       GCD_small_p (ppA (random_element,x), ppB (random_element,x),
-                   coF_random_element, coG_random_element, topLevel2,
+                   coF_random_element, coG_random_element, topLevel,
                    list);
       TIMING_END_AND_PRINT (gcd_recursion,
@@ -1627 +1626 @@
       GCD_Fp_extension (ppA (random_element, x), ppB (random_element, x),
                         coF_random_element, coG_random_element, alpha,
-                        list, topLevel2);
+                        list, topLevel);
       TIMING_END_AND_PRINT (gcd_recursion,
                             "time for recursive call: ");
@@ -1653 +1652 @@
       GCD_Fp_extension (ppA (random_element, x), ppB (random_element, x),
                         coF_random_element, coG_random_element, alpha,
-                        list, topLevel2);
+                        list, topLevel);
       TIMING_END_AND_PRINT (gcd_recursion,
                             "time for recursive call: ");
@@ -1698 +1697 @@
       DEBOUTLN (cerr, "getMipo (alpha)= " << getMipo (V_buf2));
 
-      inextensionextension= true;
       for (CFListIterator i= l; i.hasItem(); i++)
         i.getItem()= mapUp (i.getItem(), alpha, V_buf, prim_elem,
@@ -1722 +1720 @@
       GCD_Fp_extension (ppA (random_element, x), ppB (random_element, x),
                         coF_random_element, coG_random_element, V_buf,
-                        list, topLevel2);
+                        list, topLevel);
       TIMING_END_AND_PRINT (gcd_recursion,
                             "time for recursive call: ");
@@ -3023 +3021 @@
     }
 
-    long rk;
     matColumns= biggestSize2 - 1;
     matRows= 0;
@@ -3029 +3026 @@
     {
       if (V_buf.level() == 1)
-        rk= gaussianElimFp (pMat[i], pL[i]);
+        (void) gaussianElimFp (pMat[i], pL[i]);
       else
-        rk= gaussianElimFq (pMat[i], pL[i], V_buf);
+        (void) gaussianElimFq (pMat[i], pL[i], V_buf);
 
       if (pMat[i] (coeffMonoms[i].size(), coeffMonoms[i].size()) == 0)
@@ -3706 +3703 @@
   topLevel= false;
   bool inextension= false;
-  bool inextensionextension= false;
   Variable V_buf, alpha;
   CanonicalForm prim_elem, im_prim_elem;
@@ -3807 +3803 @@
       DEBOUTLN (cerr, "getMipo (alpha)= " << getMipo (V_buf2));
 
-      inextensionextension= true;
       for (CFListIterator i= l; i.hasItem(); i++)
         i.getItem()= mapUp (i.getItem(), alpha, V_buf, prim_elem,
@@ -4009 +4004 @@
           DEBOUTLN (cerr, "getMipo (alpha)= " << getMipo (V_buf2));
 
-          inextensionextension= true;
           for (CFListIterator i= l; i.hasItem(); i++)
             i.getItem()= mapUp (i.getItem(), alpha, V_buf, prim_elem,

factory/facFactorize.cc

@@ -321 +321 @@
   if (!pass)
   {
-    int lev;
+    int lev= 0;
     for (int i= 1; i <= LCF.level(); i++)
     {

factory/facFqBivar.cc

@@ -41 +41 @@
 #include "NTLconvert.h"
 
+#ifdef HAVE_FLINT
+#include "FLINTconvert.h"
+#endif
+
 TIMING_DEFINE_PRINT(fac_uni_factorizer)
 TIMING_DEFINE_PRINT(fac_hensel_lift12)
@@ -145 +149 @@
 {
   Variable x= A.mvar();
-  ASSERT (A.isUnivariate() || A.inCoeffDomain(), 
+  if (A.inCoeffDomain())
+    return CFList();
+  ASSERT (A.isUnivariate(),
           "univariate polynomial expected or constant expected");
   CFFList factorsA;
@@ -215 +221 @@
   else
   {
+#ifdef HAVE_FLINT
+    nmod_poly_t FLINTA;
+    convertFacCF2nmod_poly_t (FLINTA, A);
+    nmod_poly_factor_t result;
+    nmod_poly_factor_init (result);
+    mp_limb_t leadingCoeff= nmod_poly_factor (result, FLINTA);
+    factorsA= convertFLINTnmod_poly_factor2FacCFFList (result, leadingCoeff, x);
+    if (factorsA.getFirst().factor().inCoeffDomain())
+      factorsA.removeFirst();
+    nmod_poly_factor_clear (result);
+    nmod_poly_clear (FLINTA);
+#else
     if (getCharacteristic() > 2)
     {
@@ -232 +250 @@
                                                           x);
     }
+#endif
   }
   CFList uniFactors;
@@ -648 +667 @@
   zz_p::init (getCharacteristic());
   zz_pX NTLIrredpoly;
-  int i, m;
+  int i=1, m= 2;
   // extension of F_p needed
   if (alpha.level() == 1 && beta.level() == 1 && k == 1)
@@ -2265 +2284 @@
                   )
 {
-  bool irreducible= false;
   int d;
   int* bounds= computeBounds (F, d);
@@ -2328 +2346 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           delete [] bounds;
@@ -2398 +2415 @@
                   )
 {
-  bool irreducible= false;
   int d;
   int* bounds= computeBounds (F, d);
@@ -2461 +2477 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           delete [] bounds;
@@ -2533 +2548 @@
   int degMipo= degree (getMipo (info.getAlpha()));
   Variable alpha= info.getAlpha();
-  bool irreducible= false;
   int d;
   int* bounds= computeBounds (F, d);
@@ -2650 +2664 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           Variable y= Variable (2);
           CanonicalForm tmp= F (y - evaluation, y);
@@ -2722 +2735 @@
                     const Variable& alpha, int precision)
 {
-  bool irreducible= false;
   int d;
   int* bounds= computeBounds (F, d);
@@ -2786 +2798 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           delete [] bounds;
@@ -2844 +2855 @@
                        )
 {
-  bool irreducible= false;
   int d;
   int* bounds= computeBounds (F, d);
@@ -2908 +2918 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           delete [] bounds;
@@ -2976 +2985 @@
 {
   CFList result= CFList();
-  bool irreducible= false;
   CFArray * A= new CFArray [factors.length()];
   int oldL2= oldL/2;
@@ -3033 +3041 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           return CFList (F);
@@ -3041 +3048 @@
     if (NTLN.NumCols() == 1)
     {
-      irreducible= true;
       delete [] A;
       return CFList (F);
@@ -3083 +3089 @@
 {
   CFList result= CFList();
-  bool irreducible= false;
   CFArray * A= new CFArray [factors.length()];
   int oldL2= oldL/2;
@@ -3137 +3142 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           return CFList (F);
@@ -3145 +3149 @@
     if (NTLN.NumCols() == 1)
     {
-      irreducible= true;
       delete [] A;
       return CFList (F);
@@ -3191 +3194 @@
 {
   CFList result= CFList();
-  bool irreducible= false;
   CFArray * A= new CFArray [factors.length()];
   int oldL2= oldL/2; //be careful
@@ -3302 +3304 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           Variable y= Variable (2);
           CanonicalForm tmp= F (y - evaluation, y);
@@ -3314 +3315 @@
     if (NTLN.NumCols() == 1)
     {
-      irreducible= true;
       Variable y= Variable (2);
       CanonicalForm tmp= F (y - evaluation, y);
@@ -3363 +3363 @@
 {
   CFList result= CFList();
-  bool irreducible= false;
   CFArray * A= new CFArray [factors.length()];
   int extensionDeg= degree (getMipo (alpha));
@@ -3418 +3417 @@
         if (NTLN.NumCols() == 1)
         {
-          irreducible= true;
           delete [] A;
           return CFList (F);

factory/facFqBivarUtil.cc

@@ -669 +669 @@
   int** newtonPolyg= newtonPolygon (F, sizeOfNewtonPolygon);
 
-  int minXIndex= 0, minYIndex= 0, maxXIndex= 0, maxYIndex= 0;
   int minX, minY, maxX, maxY;
   minX= newtonPolyg [0] [0];
@@ -678 +677 @@
   {
     if (minX > newtonPolyg [i] [0])
-    {
       minX= newtonPolyg [i] [0];
-      minXIndex= i;
-    }
     if (maxX < newtonPolyg [i] [0])
-    {
       maxX= newtonPolyg [i] [0];
-      maxXIndex= i;
-    }
     if (minY > newtonPolyg [i] [1])
-    {
       minY= newtonPolyg [i] [1];
-      minYIndex= i;
-    }
     if (maxY < newtonPolyg [i] [1])
-    {
       maxY= newtonPolyg [i] [1];
-      maxYIndex= i;
-    }
   }
 

factory/facFqFactorize.cc

@@ -1499 +1499 @@
   if (!pass)
   {
-    int lev;
+    int lev= 0;
     // LCF is non-constant here
     for (int i= 1; i <= LCF.level(); i++)

factory/facMul.cc

@@ -107 +107 @@
 
   fmpz_poly_t FLINTA,FLINTB;
-  fmpz_poly_init (FLINTA);
-  fmpz_poly_init (FLINTB);
   kronSub (FLINTA, A, d);
   kronSub (FLINTB, B, d);
@@ -217 +215 @@
 
   fmpz_poly_t FLINTA,FLINTB;
-  fmpz_poly_init (FLINTA);
-  fmpz_poly_init (FLINTB);
   kronSub (FLINTA, A, d);
   kronSub (FLINTB, B, d);
@@ -1357 +1353 @@
 
   nmod_poly_t F1, F2;
-  mp_limb_t ninv= n_preinvert_limb (getCharacteristic());
-  nmod_poly_init_preinv (F1, getCharacteristic(), ninv);
-  nmod_poly_init_preinv (F2, getCharacteristic(), ninv);
   kronSubReciproFp (F1, F2, F, d1);
 
   nmod_poly_t G1, G2;
-  nmod_poly_init_preinv (G1, getCharacteristic(), ninv);
-  nmod_poly_init_preinv (G2, getCharacteristic(), ninv);
   kronSubReciproFp (G1, G2, G, d1);
 
@@ -1409 +1400 @@
 
   nmod_poly_t FLINTA, FLINTB;
-  mp_limb_t ninv= n_preinvert_limb (getCharacteristic());
-  nmod_poly_init_preinv (FLINTA, getCharacteristic(), ninv);
-  nmod_poly_init_preinv (FLINTB, getCharacteristic(), ninv);
   kronSubFp (FLINTA, A, d1);
   kronSubFp (FLINTB, B, d1);
@@ -1434 +1422 @@
 
   fmpz_poly_t F1, F2;
-  fmpz_poly_init (F1);
-  fmpz_poly_init (F2);
   kronSubReciproQ (F1, F2, F, d1);
 
   fmpz_poly_t G1, G2;
-  fmpz_poly_init (G1);
-  fmpz_poly_init (G2);
   kronSubReciproQ (G1, G2, G, d1);
 
@@ -1483 +1467 @@
 
   fmpz_poly_t FLINTA, FLINTB;
-  fmpz_poly_init (FLINTA);
-  fmpz_poly_init (FLINTB);
   kronSub (FLINTA, A, d1);
   kronSub (FLINTB, B, d1);

libpolys/polys/clapsing.cc

@@ -501 +501 @@
 }
 
-static int primepower(int c, const ring r)
-{
-  int p=1;
-  int cc=c;
-  while(cc!= rChar(r)) { cc*=c; p++; }
-  return p;
-}
-
 BOOLEAN count_Factors(ideal I, intvec *v,int j, poly &f, poly fac, const ring r)
 {