Changeset 530295 in git for factory/facBivar.h

Timestamp:

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

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

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

File:

• factory/facBivar.h (modified) (4 diffs)

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();