Changeset 07f20e1 in git for Singular/clapsing.cc

Timestamp:

Jun 14, 1999, 6:25:42 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

05bcd531ee2a91c26af99c19808959dac564df67

Parents:

74fe50d0de12691ddaa37a4a8527e5e220253ab8

Message:

fixed dectection of constants


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

File:

• Singular/clapsing.cc (modified) (9 diffs)

Singular/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.50 1999-04-17 14:58:38 obachman Exp $
+// $Id: clapsing.cc,v 1.51 1999-06-14 16:25:42 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -204 +204 @@
   else         return pCopy(f); // g==0 => gcd=f (but do a pCleardenom)
   if (f==NULL) return pCopy(g); // f==0 => gcd=g (but do a pCleardenom)
- 
+
   // for now there is only the possibility to handle polynomials over
   // Q and Fp ...
@@ -618 +618 @@
 }
 
+static int primepower(int c)
+{
+  int p=1;
+  int cc=c;
+  while(cc!= rInternalChar(currRing)) { cc*=c; p++; }
+  return p;
+}
+
 ideal singclap_factorize ( poly f, intvec ** v , int with_exps)
 {
@@ -641 +649 @@
   number NN=NULL;
 
-  if (( (nGetChar() == 0) || (nGetChar() > 1) )
-  && (currRing->parameter==NULL))
+  if (rField_is_Q() || rField_is_Zp())
   {
     setCharacteristic( nGetChar() );
@@ -676 +683 @@
     }
   }
+  else if (rField_is_GF())
+  {
+    int c=rChar(currRing);
+    setCharacteristic( c, primepower(c) );
+    CanonicalForm F( convSingGFClapGF( f ) );
+    if (F.isUnivariate())
+    {
+      L = factorize( F );
+    }
+    else
+    {
+      goto notImpl;
+    }
+  }
   // and over Q(a) / Fp(a)
-  else if (( nGetChar()==1 ) /* Q(a) */
-  || (nGetChar() <-1))       /* Fp(a) */
+  else if (rField_is_Extension())
   {
     if (nGetChar()==1) setCharacteristic( 0 );
@@ -688 +708 @@
       Variable a=rootOf(mipo);
       CanonicalForm F( convSingAPClapAP( f,a ) );
+      L.insert(F);
       if (F.isUnivariate())
       {
@@ -694 +715 @@
       else
       {
+        WarnS("complete factorization only for univariate polynomials");
         CanonicalForm G( convSingTrPClapP( f ) );
-        L = factorize( G );
+        if (nGetChar()==1) /* Q(a) */
+        {
+          L = factorize( G );
+        }
+        else
+        {
+#ifdef HAVE_LIBFAC_P
+          L = Factorize( G );
+#else
+          goto notImpl;
+#endif
+        }
       }
     }
@@ -740 +773 @@
     {
       if (with_exps!=1) (**v)[j] = J.getItem().exp();
-      if ((nGetChar()==0)||(nGetChar()>1))           /* Q, Fp */
+      if (rField_is_Zp() || rField_is_Q())           /* Q, Fp */
         res->m[j] = convClapPSingP( J.getItem().factor() );
-      else if ((nGetChar()==1)||(nGetChar()<-1))     /* Q(a), Fp(a) */
+      else if (rField_is_GF())
+        res->m[j] = convClapGFSingGF( J.getItem().factor() );
+      else if (rField_is_Extension())     /* Q(a), Fp(a) */
       {
         if (currRing->minpoly==NULL)
@@ -763 +798 @@
       for(;i>=0;i--)
       {
-        if (pIsConstant(res->m[i]))
+        if ((res->m[i]!=NULL) && (pNext(res->m[i])==NULL) && (pIsConstant(res->m[i])))
         {
           pDelete(&(res->m[i]));