Changeset 530295 in git

Timestamp:

Jan 5, 2012, 5:52:39 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

0e6668ef96c23537076f15491667b780427d0f91

Parents:

88408d0be2fdcd560bb0eceb25b88db10bf0c817

git-author:

Martin Lee <martinlee84@web.de>2012-01-05 17:52:39+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:25+02:00

Message:

chg: more changes to replace polynomial factorization over integer with new algorithm

Location:

factory

Files:

• cf_factor.cc (modified) (1 diff)
• facBivar.h (modified) (4 diffs)
• facFactorize.h (modified) (2 diffs)

factory/cf_factor.cc

@@ -648 +648 @@
       {
         CFList factors;
-        factors= ratSqrfFactorize (fz, Variable (1));
+        factors= ratSqrfFactorize (fz);
         for (CFListIterator i= factors; i.hasItem(); i++)
           F.append (CFFactor (i.getItem(), 1));
       }
       else
-        F = ratFactorize (fz, Variable (1));
+        F = ratFactorize (fz);
       Off (SW_RATIONAL);
       #else

factory/facBivar.h

@@ -42 +42 @@
 inline
 CFList
-ratBiSqrfFactorize (const CanonicalForm & G, ///< [in] a bivariate poly
-                    const Variable& v        ///< [in] algebraic variable
+ratBiSqrfFactorize (const CanonicalForm & G,        ///< [in] a bivariate poly
+                    const Variable& v= Variable (1) ///< [in] algebraic variable
                    )
 {
@@ -52 +52 @@
   F /= (contentX*contentY);
   CFFList contentXFactors, contentYFactors;
-  contentXFactors= factorize (contentX, v);
-  contentYFactors= factorize (contentY, v);
+  if (v.level() != 1)
+  {
+    contentXFactors= factorize (contentX, v);
+    contentYFactors= factorize (contentY, v);
+  }
+  else
+  {
+    contentXFactors= factorize (contentX);
+    contentYFactors= factorize (contentY);
+  }
   if (contentXFactors.getFirst().factor().inCoeffDomain())
     contentXFactors.removeFirst();
@@ -96 +104 @@
 inline
 CFFList
-ratBiFactorize (const CanonicalForm & G, ///< [in] a bivariate poly
-                const Variable& v,       ///< [in] algebraic variable
-                bool substCheck= true    ///< [in] enables substitute check
+ratBiFactorize (const CanonicalForm & G,         ///< [in] a bivariate poly
+                const Variable& v= Variable (1), ///< [in] algebraic variable
+                bool substCheck= true        ///< [in] enables substitute check
                )
 {
@@ -150 +158 @@
   F /= (contentX*contentY);
   CFFList contentXFactors, contentYFactors;
-  contentXFactors= factorize (contentX, v);
-  contentYFactors= factorize (contentY, v);
+  if (v.level() != 1)
+  {
+    contentXFactors= factorize (contentX, v);
+    contentYFactors= factorize (contentY, v);
+  }
+  else
+  {
+    contentXFactors= factorize (contentX);
+    contentYFactors= factorize (contentY);
+  }
   if (contentXFactors.getFirst().factor().inCoeffDomain())
     contentXFactors.removeFirst();

factory/facFactorize.h

@@ -36 +36 @@
 inline
 CFList
-ratSqrfFactorize (const CanonicalForm & G,       ///<[in] a multivariate poly
-                  const Variable& v              ///<[in] algebraic variable
+ratSqrfFactorize (const CanonicalForm & G,        ///<[in] a multivariate poly
+                  const Variable& v= Variable (1) ///<[in] algebraic variable
                  )
 {
@@ -60 +60 @@
 inline
 CFFList
-ratFactorize (const CanonicalForm& G,        ///<[in] a multivariate poly
-              const Variable& v,             ///<[in] algebraic variable
-              bool substCheck= true          ///<[in] enables substitute check
+ratFactorize (const CanonicalForm& G,          ///<[in] a multivariate poly
+              const Variable& v= Variable (1), ///<[in] algebraic variable
+              bool substCheck= true            ///<[in] enables substitute check
              )
 {