Changeset f41d12 in git for factory/fac_sqrfree.cc

Timestamp:

Dec 13, 2011, 8:02:27 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

0943bdd5f1e662166add7c3fed483d8971bd4108

Parents:

3ef9c82a32b5b066dbd0e7b53857aa1fe70108a5f78374aba946095faa511cce5808e17088898c1a

Message:

Merge pull request #33 from mmklee/factory_sqrfree_sw

chg: more changes of squarefree decomposition according to master

File:

• factory/fac_sqrfree.cc (modified) (4 diffs)

factory/fac_sqrfree.cc

@@ -9 +9 @@
 #include "canonicalform.h"
 #include "cf_map.h"
+#include "cf_algorithm.h"
 
 static int divexp = 1;
@@ -140 +141 @@
     if ( a.inCoeffDomain() )
         return CFFactor( a, 1 );
-    CanonicalForm cont = content( a );
-    CanonicalForm aa = a / cont;
+    CanonicalForm aa, LcA;
+    if (isOn (SW_RATIONAL))
+    {
+      LcA= bCommonDen (a);
+      aa= a*LcA;
+    }
+    else
+    {
+      LcA= icontent (a);
+      if (lc (a).sign() < 0)
+        LcA= -LcA;
+      aa= a/LcA;
+    }
+    CanonicalForm cont = content( aa );
+    aa /= cont;
     CanonicalForm b = aa.deriv(), c = gcd( aa, b );
     CanonicalForm y, z, w = aa / c;
@@ -152 +166 @@
         if ( degree( z, v ) > 0 )
         {
-            if ( lc( z ).sign() < 0 )
-                F.append( CFFactor( -z, i ) );
-            else
-                F.append( CFFactor( z, i ) );
+          if (isOn (SW_RATIONAL))
+          {
+            z /= Lc (z);
+            z *= bCommonDen (z);
+          }
+          if (lc (z).sign() < 0)
+            z= -z;
+          F.append( CFFactor( z, i ) );
         }
         i++;
@@ -162 +180 @@
     if ( degree( w,v ) > 0 )
     {
-        if ( lc( w ).sign() < 0 )
-            F.append( CFFactor( -w, i ) );
-        else
-            F.append( CFFactor( w, i ) );
+      if (isOn (SW_RATIONAL))
+      {
+        w /= Lc (w);
+        w *= bCommonDen (w);
+      }
+      if (lc (w).sign() < 0)
+        w= -w;
+      F.append( CFFactor( w, i ) );
     }
     if ( ! cont.isOne() )
-        F = Union( F, sqrFreeZ( cont ) );
-    if ( lc( a ).sign() < 0 )
-    {
-        if ( F.getFirst().exp() == 1 )
-        {
-            CanonicalForm f = F.getFirst().factor();
-            CFFListIterator(F).getItem() = CFFactor( -f, 1 );
-        }
-        else
-            F.insert( CFFactor( -1, 1 ) );
-    }
+    {
+        CFFList buf= sqrFreeZ (cont);
+        buf.removeFirst();
+        F = Union( F, buf );
+    }
+    F.insert (CFFactor (LcA, 1));
     return F;
 }