Changeset a81073 in git for factory

Timestamp:

Jan 22, 2008, 10:29:08 AM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c6d3744af7f072c74673ab0aef31dfe80c1c9ae9

Parents:

af0ef61c8831698375f12ed2c1c9a817c7370ae9

Message:

*hannes: format


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

Location:

factory

Files:

• cf_factor.cc (modified) (3 diffs)
• fac_distrib.cc (modified) (6 diffs)
• fac_multihensel.cc (modified) (2 diffs)

factory/cf_factor.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_factor.cc,v 1.37 2008-01-15 12:36:50 Singular Exp $ */
+/* $Id: cf_factor.cc,v 1.38 2008-01-22 09:28:22 Singular Exp $ */
 
 //{{{ docu
@@ -481 +481 @@
     {
         // char p, not univariate
-        printf("factorize char p, not univariate\n");
-    }
-  }
-  else
+        //printf("factorize char p, not univariate\n");
+        F = FpFactorizeMultivariate( f, issqrfree );
+    }
+  }
+  else // char 0
   {
     bool on_rational = isOn(SW_RATIONAL);
@@ -701 +702 @@
 }
 
-CFFList sqrFree ( const CanonicalForm & f, bool sort )
-{
-//    ASSERT( f.isUnivariate(), "multivariate factorization not implemented" );
+CFFList sqrFree ( const CanonicalForm & f, const CanonicalForm & mipo, bool sort )
+{
+    if ( getNumVars(f) == 0 )
+      return CFFactor(f,1);
+
     CFFList result;
+    CanonicalForm c;
+    if (getCharacteristic() == 0 ) c=icontent(f);
+    else                           c=f.lc();
+    CanonicalForm g=f;
+    if (!c.isOne())
+    {
+       result=CFFactor(c,1);
+       g/=c;
+    }
 
     if ( getCharacteristic() == 0 )
-        result = sqrFreeZ( f );
+        result=Union(result,sqrFreeZ( g, mipo ));
     else
-        result = sqrFreeFp( f );
+        result=Union(result,sqrFreeFp( g, mipo ));
 
     return ( sort ? sortCFFList( result ) : result );

factory/fac_distrib.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fac_distrib.cc,v 1.8 2006-05-16 13:43:18 Singular Exp $ */
+/* $Id: fac_distrib.cc,v 1.9 2008-01-22 09:28:39 Singular Exp $ */
 
 #include <config.h>
@@ -69 +69 @@
         lcG[j] = 1;
 
-    for ( I = F, i = 1; I.hasItem(); I++, i++ ) {
+    for ( I = F, i = 1; I.hasItem(); I++, i++ )
+    {
         ft = I.getItem().factor();
         m = I.getItem().exp();
@@ -76 +77 @@
         DEBOUTLN( cerr, "and contained to the power of " << m );
         j = 1;
-        while ( m > 0 && j <= r ) {
+        while ( m > 0 && j <= r )
+        {
             ut = lc( G[j] );
             DEBOUTLN( cerr, "checking with " << ut );
-            while ( m > 0 && fdivides( D[i], ut ) ) {
+            while ( m > 0 && fdivides( D[i], ut ) )
+            {
                 DEBOUTLN( cerr, "match found" );
                 m--; ut /= D[i];
@@ -86 +89 @@
             j++;
         }
-        if (m != 0) {
+        if (m != 0)
+        {
             DEBDECLEVEL( cerr, "distributeLeadingCoeffs" );
             return false;
@@ -92 +96 @@
     }
     DEBOUTLN( cerr, "the leading coeffs before omega and delta correction: " << lcG );
-    if ( omega != 1 ) {
-        for ( j = 1; j <= r; j++ ) {
+    if ( omega != 1 )
+    {
+        for ( j = 1; j <= r; j++ )
+        {
 //            G[j] *= omega;
             lcG[j] *= omega;
@@ -100 +106 @@
         U *= power( omega, r-1 );
     }
-    if ( delta != 1 ) {
-        for ( j = 1; j <= r; j++ ) {
+    if ( delta != 1 )
+    {
+        for ( j = 1; j <= r; j++ )
+        {
             lcG[j] *= delta;
             G[j] = G[j] * ( A( lcG[j] ) / lc( G[j] ) );

factory/fac_multihensel.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fac_multihensel.cc,v 1.8 2002-10-10 17:43:40 Singular Exp $ */
+/* $Id: fac_multihensel.cc,v 1.9 2008-01-22 09:29:08 Singular Exp $ */
 
 #include <config.h>
@@ -312 +312 @@
 
     Uk[t] = U;
-    for ( k = t-1; k > 1; k-- ) {
+    for ( k = t-1; k > 1; k-- )
+    {
         Uk[k] = Uk[k+1]( A[k+1], Variable( k+1 ) );
         n[k] = degree( Uk[k], Variable( k ) );
     }
-    for ( k = A.min(); goodeval && (k <= t); k++ ) {
+    for ( k = A.min(); goodeval && (k <= t); k++ )
+    {
         h = totaldegree( Uk[k], Variable(A.min()), Variable(k-1) );
         for ( i = A.min(); i <= k; i++ )