Changeset 5f9b47 in git for factory/facFactorize.h

Timestamp:

Oct 13, 2011, 4:28:33 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

a6423611ab89e02788fee9f049f4e6b2e2dac782

Parents:

c79a9d3a83d34151b67ba9ac3b63b827a07b792f

Message:

use sqrfree factorization instead of sqrfree part extraction for factorization ove Q(a)


git-svn-id: file:///usr/local/Singular/svn/trunk@14412 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/facFactorize.h (modified) (2 diffs)

factory/facFactorize.h

@@ -34 +34 @@
 ///         element is the leading coefficient.
 inline
-CFList ratSqrfFactorize (const CanonicalForm & F, ///< [in] a multivariate poly
+CFList ratSqrfFactorize (const CanonicalForm & G, ///< [in] a multivariate poly
                          const Variable& v
                        )
 {
-  if (getNumVars (F) == 2)
-    return ratBiSqrfFactorize (F, v);
+  if (getNumVars (G) == 2)
+    return ratBiSqrfFactorize (G, v);
+  CanonicalForm F= G;
+  if (isOn (SW_RATIONAL))
+    F *= bCommonDen (F);
   CFList result= multiFactorize (F, v);
   if (isOn (SW_RATIONAL))
@@ -54 +57 @@
 ///         multiplicity, the first element is the leading coefficient.
 inline
-CFFList ratFactorize (const CanonicalForm& F, ///< [in] a multivariate poly
+CFFList ratFactorize (const CanonicalForm& G, ///< [in] a multivariate poly
                       const Variable& v
                     )
 {
-  if (getNumVars (F) == 2)
+  if (getNumVars (G) == 2)
   {
-    CFFList result= ratBiFactorize (F,v);
+    CFFList result= ratBiFactorize (G,v);
     return result;
   }
-  Variable a= Variable (1);
+  CanonicalForm F= G;
   CanonicalForm LcF= Lc (F);
+  if (isOn (SW_RATIONAL))
+    F *= bCommonDen (F);
 
-  CanonicalForm sqrfP= sqrfPart (F);
-  CFList buf;
   CFFList result;
-  buf= multiFactorize (sqrfP, v);
-  CanonicalForm G= F;
-  result= multiplicity (G, buf);
+  CFFList sqrfFactors= sqrFree (F);
+  for (CFFListIterator i= sqrfFactors; i.hasItem(); i++)
+  {
+    CFList tmp= ratSqrfFactorize (i.getItem().factor(), v);
+    for (CFListIterator j= tmp; j.hasItem(); j++)
+    {
+      if (j.getItem().inCoeffDomain()) continue;
+      result.append (CFFactor (j.getItem(), i.getItem().exp()));
+    }
+  }
   if (isOn (SW_RATIONAL))
   {