Changeset f41d12 in git

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

0943bdd5f1e662166add7c3fed483d8971bd4108

Parents:

3ef9c82a32b5b066dbd0e7b53857aa1fe70108a5f78374aba946095faa511cce5808e17088898c1a

Message:

Merge pull request #33 from mmklee/factory_sqrfree_sw

chg: more changes of squarefree decomposition according to master

Files:

• factory/cf_algorithm.h (modified) (1 diff)
• factory/cf_factor.cc (modified) (3 diffs)
• factory/fac_multivar.cc (modified) (1 diff)
• factory/fac_sqrfree.cc (modified) (4 diffs)
• libpolys/polys/clapsing.cc (modified) (3 diffs)

factory/cf_algorithm.h

@@ -70 +70 @@
 CFFList factorize ( const CanonicalForm & f, const Variable & alpha );
 
-CFFList sqrFree ( const CanonicalForm & f );
+CFFList sqrFree ( const CanonicalForm & f, bool sort= false );
 
 bool isSqrFree ( const CanonicalForm & f );

factory/cf_factor.cc

@@ -26 +26 @@
 #include "cf_algorithm.h"
 #include "facFqFactorize.h"
+#include "facFqSquarefree.h"
 #include "cf_map.h"
 #include "algext.h"
@@ -829 +830 @@
 }
 
-CFFList sqrFree ( const CanonicalForm & f )
+CFFList sqrFree ( const CanonicalForm & f, bool sort )
 {
 //    ASSERT( f.isUnivariate(), "multivariate factorization not implemented" );
@@ -837 +838 @@
         result = sqrFreeZ( f );
     else
-        result = sqrFreeFp( f );
-
-    //return ( sort ? sortCFFList( result ) : result );
+    {
+        Variable alpha;
+        if (hasFirstAlgVar (f, alpha))
+          result = FqSqrf( f, alpha );
+        else
+          result= FpSqrf (f);
+    }
+    if (sort)
+    {
+      CFFactor buf= result.getFirst();
+      result.removeFirst();
+      result= sortCFFList (result);
+      result.insert (buf);
+    }
     return result;
 }

factory/fac_multivar.cc

@@ -361 +361 @@
     {
         if ( i.getItem().factor().inCoeffDomain() )
-        {
-            if ( ! i.getItem().factor().isOne() )
-                R.append( CFFactor( i.getItem().factor(), i.getItem().exp() ) );
-        }
+            R.append( CFFactor( i.getItem().factor(), i.getItem().exp() ) );
         else
         {

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;
 }

libpolys/polys/clapsing.cc

@@ -1035 +1035 @@
   number N=NULL;
   number NN=NULL;
+  number old_lead_coeff=n_Copy(pGetCoeff(f), r->cf);
 
   if (!rField_is_Zp(r) && !rField_is_Zp_a(r)) /* Q, Q(a) */
@@ -1154 +1155 @@
       res->m[0]=p_One(r);
     }
-  }
+    if (N!=NULL)
+    {
+      p_Mult_nn(res->m[0],N,r);
+      n_Delete(&N,r->cf);
+      N=NULL;
+    }
+  }
+  if (rField_is_Q_a(r) && (r->cf->extRing->minideal!=NULL))
+  {
+    int i=IDELEMS(res)-1;
+    int stop=1;
+    if (with_exps!=0) stop=0;
+    for(;i>=stop;i--)
+    {
+      p_Norm(res->m[i],r);
+    }
+    if (with_exps==0) p_SetCoeff(res->m[0],old_lead_coeff,r);
+    else n_Delete(&old_lead_coeff,r->cf);
+  }
+  else
+    n_Delete(&old_lead_coeff,r->cf);
   p_Delete(&f,r);
   errorreported=save_errorreported;
@@ -1160 +1181 @@
   if (res==NULL)
     WerrorS( feNotImplemented );
+  if (NN!=NULL)
+  {
+    n_Delete(&NN,r->cf);
+  }
+  if (N!=NULL)
+  {
+    n_Delete(&N,r->cf);
+  }
   return res;
 }