Changeset 8fc55e2 in git for kernel/clapsing.cc

Timestamp:

Feb 11, 2009, 3:56:16 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

c5d8ddb1112344ad68257ea0c296d5b17aee0433

Parents:

fb2a0c9a162edde64cee86932710bc946dd583dc

Message:

*hannes: set wrong factors to 1


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

File:

• kernel/clapsing.cc (modified) (6 diffs)

kernel/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.32 2008-12-17 15:08:50 Singular Exp $
+// $Id: clapsing.cc,v 1.33 2009-02-11 14:56:16 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -195 +195 @@
 
 
-
+void out_cf(char *s1,const CanonicalForm &f,char *s2);
 
 
@@ -259 +259 @@
       #endif
       {
-        bool b=isOn(SW_USE_QGCD);
-        if ( nGetChar()==1 ) On(SW_USE_QGCD);
+        bool b=isOn(SW_USE_QGCD);
+        if ( nGetChar()==1 ) On(SW_USE_QGCD);
         CanonicalForm mipo=convSingTrFactoryP(((lnumber)currRing->minpoly)->z);
         Variable a=rootOf(mipo);
         CanonicalForm F( convSingAPFactoryAP( f,a ) ), G( convSingAPFactoryAP( g,a ) );
         res= convFactoryAPSingAP( gcd( F, G ) );
-        if (!b) Off(SW_USE_QGCD);
+        if (!b) Off(SW_USE_QGCD);
       }
     }
@@ -971 +971 @@
         #endif
         libfac_interruptflag=0;
-        //else
-        //  L=Factorize(G, mipo);
 #else
         WarnS("complete factorization only for univariate polynomials");
@@ -1032 +1030 @@
       if (with_exps!=1) (**v)[j] = J.getItem().exp();
       if (rField_is_Zp() || rField_is_Q())           /* Q, Fp */
+      {
         //count_Factors(res,*v,f, j, convFactoryPSingP( J.getItem().factor() );
         res->m[j] = convFactoryPSingP( J.getItem().factor() );
+      }
       #if 0
       else if (rField_is_GF())
@@ -1043 +1043 @@
         if (v!=NULL) w=*v;
         if (currRing->minpoly==NULL)
-          count_Factors(res,w,j,ff,convFactoryPSingTrP( J.getItem().factor() ));
+        {
+          if(!count_Factors(res,w,j,ff,convFactoryPSingTrP( J.getItem().factor() )))
+            res->m[j]=pOne();
+        }
         else
-          count_Factors(res,w,j,ff,convFactoryAPSingAP( J.getItem().factor() ));
+        {
+          if (!count_Factors(res,w,j,ff,convFactoryAPSingAP( J.getItem().factor() )))
+
+            res->m[j]=pOne();
+        }
       }
     }