Changeset 34ceab in git for kernel/clapsing.cc

Timestamp:

Jun 24, 2010, 4:00:15 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

6a9e46e4d4665d53cada3be5141ec2ab5e6cca8b

Parents:

979dab6fd11ae8dfb1094472739d3ad502c5b9bd

Message:

new factorization for Zp, Zp_a

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

File:

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

kernel/clapsing.cc

@@ -830 +830 @@
     setCharacteristic( nGetChar() );
     CanonicalForm F( convSingPFactoryP( f ) );
-    if (rField_is_Q())
-    {
-      L = factorize( F );
-    }
-    else /* Fp */
-    {
-      do
-      {
-        libfac_interruptflag=0;
-        L = Factorize( F );
-      }
-      while ((libfac_interruptflag!=0) ||(L.isEmpty()));
-    }
+    L = factorize( F );
   }
   #if 0
@@ -871 +859 @@
       Variable a=rootOf(mipo);
       CanonicalForm F( convSingAPFactoryAP( f,a,currRing ) );
-      if (rField_is_Zp_a() && F.isUnivariate())
+      if (rField_is_Zp_a())
       {
         L = factorize( F, a );
@@ -878 +866 @@
       {
         CanonicalForm G( convSingTrPFactoryP( f ) );
-        //  over Q(a) / multivariate over Fp(a)
+        //  over Q(a)
         do
         {
@@ -894 +882 @@
     {
       CanonicalForm F( convSingTrPFactoryP( f ) );
-      if (rField_is_Q_a())
-      {
-        L = factorize( F );
-      }
-      else /* Fp(a) */
-      {
-        L = Factorize( F );
-      }
+      L = factorize( F );
     }
   }