Changeset 5f9b47 in git for factory

Timestamp:

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

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

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

Location:

factory

Files:

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

factory/facAlgExt.cc

@@ -151 +151 @@
     return CFFList (CFFactor (F, 1));
 
-  CanonicalForm sqrf= uniSqrfPart (F);
-  CFList sqrfFactors= AlgExtSqrfFactorize (sqrf, alpha);
-
   bool save_rat=!isOn (SW_RATIONAL);
   On (SW_RATIONAL);
-  CanonicalForm quot, buf= F/Lc (F);
+  CFFList sqrf= sqrFreeZ (F);
+  CFList factorsSqrf;
   CFFList factors;
-  int multi;
-  for (CFListIterator i= sqrfFactors; i.hasItem(); i++)
+  CFListIterator j;
+
+  for (CFFListIterator i= sqrf; i.hasItem(); i++)
   {
-    multi= 0;
-    i.getItem() /= Lc (i.getItem()); //make factors monic
-    while (fdivides (i.getItem(), buf, quot))
-    {
-      buf= quot;
-      multi++;
-    }
-    factors.append (CFFactor (i.getItem(), multi));
+    if (i.getItem().factor().inCoeffDomain()) continue;
+    factorsSqrf= AlgExtSqrfFactorize (i.getItem().factor(), alpha);
+    for (j= factorsSqrf; j.hasItem(); j++)
+      factors.append (CFFactor (j.getItem()/Lc (j.getItem()), i.getItem().exp()));
   }
+
   factors.insert (CFFactor (Lc(F), 1));
   ASSERT (degree (buf) <= 0, "bug in AlgExtFactorize");

factory/facBivar.h

@@ -126 +126 @@
   vec_ZZ S;
   F= compress (F, M, S);
-  CanonicalForm sqrfP= sqrfPart (F);
-  CFList buf;
-  buf= biFactorize (sqrfP, v);
-  result= multiplicity (F, buf);
-  for (CFFListIterator i= result; i.hasItem(); i++)
-    i.getItem()= CFFactor (N (decompress (i.getItem().factor(), M, S)),
-                             i.getItem().exp());
+  CFFList sqrfFactors= sqrFree (F);
+  for (CFFListIterator i= sqrfFactors; i.hasItem(); i++)
+  {
+    CFList tmp= ratBiSqrfFactorize (i.getItem().factor(), v);
+    for (CFListIterator j= tmp; j.hasItem(); j++)
+    {
+      if (j.getItem().inCoeffDomain()) continue;
+      result.append (CFFactor (N (decompress (j.getItem(), M, S)), i.getItem().exp()));
+    }
+  }
   result= Union (result, contentXFactors);
   result= Union (result, contentYFactors);

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))
   {