Changeset 44cd9a in git

Timestamp:

Aug 21, 2013, 1:30:17 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

849b7c0914e5ad7a169d24144d3e469708518d0b

Parents:

ffae30a2130f2ca69e796b942659b22f5597fc03

git-author:

Martin Lee <martinlee84@web.de>2013-08-21 13:30:17+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-08-30 13:48:37+02:00

Message:

chg: added convex dense compression
chg: changes to uniAbsFactorize
chg: more documentation

Location:

factory

Files:

• facAbsBiFact.cc (modified) (6 diffs)
• facAbsBiFact.h (modified) (2 diffs)

factory/facAbsBiFact.cc

@@ -36 +36 @@
 TIMING_DEFINE_PRINT(fac_evalpoint)
 
-CFAFList uniAbsFactorize (const CanonicalForm& F)
+CFAFList uniAbsFactorize (const CanonicalForm& F, bool full)
 {
-  CFFList rationalFactors= factorize (F);
-  CFFListIterator i= rationalFactors;
-  CanonicalForm LcF= rationalFactors.getFirst().factor();
-  i++;
+  CFAFList result;
+  if (degree (F) == 1)
+  {
+    bool isRat= isOn (SW_RATIONAL);
+    On (SW_RATIONAL);
+    result= CFAFList (CFAFactor (F/Lc(F), 1, 1));
+    result.insert (CFAFactor (Lc (F), 1, 1));
+    if (!isRat)
+      Off (SW_RATIONAL);
+    return result;
+  }
+  CanonicalForm LcF= 1;
   Variable alpha;
-  CFAFList result;
   CFFList QaFactors;
   CFFListIterator iter;
-  for (; i.hasItem(); i++)
-  {
-    if (degree (i.getItem().factor()) == 1)
-    {
-      result.append (CFAFactor (i.getItem().factor(), 1, i.getItem().exp()));
-      continue;
-    }
-    alpha= rootOf (i.getItem().factor());
-    QaFactors= factorize (i.getItem().factor(), alpha);
-    iter= QaFactors;
-    if (iter.getItem().factor().inCoeffDomain())
-    {
-      LcF *= iter.getItem().factor();
-      iter++;
-    }
-    for (;iter.hasItem(); iter++)
-    {
-      if (degree (iter.getItem().factor()) == 1)
-      {
-        result.append (CFAFactor (iter.getItem().factor(), getMipo (alpha),
-                                  i.getItem().exp()));
-        break;
-      }
+  alpha= rootOf (F);
+  QaFactors= factorize (F, alpha);
+  iter= QaFactors;
+  if (iter.getItem().factor().inCoeffDomain())
+  {
+    LcF = iter.getItem().factor();
+    iter++;
+  }
+  for (;iter.hasItem(); iter++)
+  {
+    if (full)
+      result.append (CFAFactor (iter.getItem().factor(), getMipo (alpha),
+                                iter.getItem().exp()));
+    if (!full && degree (iter.getItem().factor()) == 1)
+    {
+      result.append (CFAFactor (iter.getItem().factor(), getMipo (alpha),
+                                iter.getItem().exp()));
+      break;
     }
   }
@@ -271 +273 @@
   F /= icontent (F);
   On (SW_RATIONAL);
+
+  mpz_t * M=new mpz_t [4];
+  mpz_init (M[0]);
+  mpz_init (M[1]);
+  mpz_init (M[2]);
+  mpz_init (M[3]);
+
+  mpz_t * S=new mpz_t [2];
+  mpz_init (S[0]);
+  mpz_init (S[1]);
+
+  F= compress (F, M, S);
+
+  if (F.isUnivariate())
+  {
+    if (degree (F) == 1)
+    {
+      mpz_clear (M[0]);
+      mpz_clear (M[1]);
+      mpz_clear (M[2]);
+      mpz_clear (M[3]);
+      delete [] M;
+
+      mpz_clear (S[0]);
+      mpz_clear (S[1]);
+      delete [] S;
+      if (!isRat)
+        Off (SW_RATIONAL);
+      return CFAFList (CFAFactor (G, 1, 1));
+    }
+    CFAFList result= uniAbsFactorize (F, full);
+    if (result.getFirst().factor().inCoeffDomain())
+      result.removeFirst();
+    for (CFAFListIterator iter=result; iter.hasItem(); iter++)
+      iter.getItem()= CFAFactor (decompress (iter.getItem().factor(), M, S),
+                                 iter.getItem().minpoly(),iter.getItem().exp());
+    mpz_clear (M[0]);
+    mpz_clear (M[1]);
+    mpz_clear (M[2]);
+    mpz_clear (M[3]);
+    delete [] M;
+
+    mpz_clear (S[0]);
+    mpz_clear (S[1]);
+    delete [] S;
+    if (!isRat)
+      Off (SW_RATIONAL);
+    return result;
+  }
+
+  if (degree (F, 1) == 1 || degree (F, 2) == 1)
+  {
+    mpz_clear (M[0]);
+    mpz_clear (M[1]);
+    mpz_clear (M[2]);
+    mpz_clear (M[3]);
+    delete [] M;
+
+    mpz_clear (S[0]);
+    mpz_clear (S[1]);
+    delete [] S;
+    if (!isRat)
+      Off (SW_RATIONAL);
+    return CFAFList (CFAFactor (G, 1, 1));
+  }
   int minTdeg, tdegF= totaldegree (F);
   CanonicalForm Fp, smallestFactor;
@@ -305 +372 @@
           On (SW_RATIONAL);
         setCharacteristic(0);
+        mpz_clear (M[0]);
+        mpz_clear (M[1]);
+        mpz_clear (M[2]);
+        mpz_clear (M[3]);
+        delete [] M;
+
+        mpz_clear (S[0]);
+        mpz_clear (S[1]);
+        delete [] S;
         return CFAFList (CFAFactor (G, 1, 1));
       }
@@ -314 +390 @@
           if (isRat)
             On (SW_RATIONAL);
+          mpz_clear (M[0]);
+          mpz_clear (M[1]);
+          mpz_clear (M[2]);
+          mpz_clear (M[3]);
+          delete [] M;
+
+          mpz_clear (S[0]);
+          mpz_clear (S[1]);
+          delete [] S;
           return CFAFList (CFAFactor (G, 1, 1));
         }
@@ -729 +814 @@
   {
     if (full)
-      result.append (CFAFactor (i.getItem(), getMipo (alpha), 1));
+      result.append (CFAFactor (decompress (i.getItem(), M, S),
+                                getMipo (alpha), 1));
 
     if (totaldegree (i.getItem()) == minTdeg)
     {
       if (!full)
-        result= CFAFList (CFAFactor (i.getItem(), getMipo (alpha), 1));
+        result= CFAFList (CFAFactor (decompress (i.getItem(), M, S),
+                                     getMipo (alpha), 1));
       found= true;
 
@@ -754 +841 @@
     Off (SW_RATIONAL);
 
+  mpz_clear (M[0]);
+  mpz_clear (M[1]);
+  mpz_clear (M[2]);
+  mpz_clear (M[3]);
+  delete [] M;
+
+  mpz_clear (S[0]);
+  mpz_clear (S[1]);
+  delete [] S;
+
   return result;
 }

factory/facAbsBiFact.h

@@ -21 +21 @@
 /// primitive wrt. any of its variables and irreducible over Q
 ///
-/// @return absFactorizeMain returns a list whose entries contain three entities:
+/// @return absBiFactorizeMain returns a list whose entries contain three
+///         entities:
 ///         an absolute irreducible factor, an irreducible univariate polynomial
 ///         that defines the minimal field extension over which the irreducible
-///         factor is defined and the multiplicity of the absolute irreducible
+///         factor is defined, and the multiplicity of the absolute irreducible
 ///         factor
 CFAFList absBiFactorizeMain (const CanonicalForm& F, ///<[in] s.a.
-                             bool full= false
+                             bool full= false        ///<[in] true if all
+                                                     ///< factors should be
+                                                     ///< returned
                             );
 #endif
@@ -45 +48 @@
 ///         an absolute irreducible factor, an irreducible univariate polynomial
 ///         that defines the minimal field extension over which the irreducible
-///         factor is defined and the multiplicity of the absolute irreducible
+///         factor is defined, and the multiplicity of the absolute irreducible
 ///         factor
-CFAFList uniAbsFactorize (const CanonicalForm& F ///<[in] univariate poly over Q
+CFAFList uniAbsFactorize (const CanonicalForm& F, ///<[in] univariate poly
+                                                  ///< irreducible over Q
+                          bool full= false        ///<[in] true if all factors
+                                                  ///< should be returned
                          );