Changeset d3e630 in git for kernel/clapsing.cc

Timestamp:

Jul 28, 2009, 4:19:05 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '1170388a280084e303867145f98985f03b2af06d')

Children:

a07e45cfc61927c5711cee673474fb891d4574ac

Parents:

01cda73e965c4d5da3e4d30eb09639f00d9fbe4d

Message:

*hannes: code cleanup (see ChangeLog)


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

File:

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

kernel/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.36 2009-03-17 16:51:31 Singular Exp $
+// $Id: clapsing.cc,v 1.37 2009-07-28 14:15:05 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -20 +20 @@
 #include <factory.h>
 #include "clapconv.h"
-#ifdef HAVE_LIBFAC_P
 #include <factor.h>
 //CanonicalForm algcd(const CanonicalForm & F, const CanonicalForm & g, const CFList & as, const Varlist & order);
 CanonicalForm alg_gcd(const CanonicalForm &, const CanonicalForm &, const CFList &);
-#endif
 #include "ring.h"
 
@@ -240 +238 @@
     {
     #if 0
-    #ifdef HAVE_LIBFAC_P
       if (( nGetChar()==1 ) /* Q(a) */ && (!isOn(SW_USE_QGCD)))
       {
@@ -256 +253 @@
       }
       else
-      #endif
       #endif
       {
@@ -782 +778 @@
 
 int singclap_factorize_retry;
-#ifdef HAVE_LIBFAC_P
 extern int libfac_interruptflag;
-#endif
 
 ideal singclap_factorize ( poly f, intvec ** v , int with_exps)
@@ -914 +908 @@
     else /* Fp */
     {
-#ifdef HAVE_LIBFAC_P
       do
       {
@@ -921 +914 @@
       }
       while ((libfac_interruptflag!=0) ||(L.isEmpty()));
-#else
-      goto notImpl;
-#endif
     }
   }
@@ -959 +949 @@
       {
         CanonicalForm G( convSingTrPFactoryP( f ) );
-#ifdef HAVE_LIBFAC_P
         //  over Q(a) / multivariate over Fp(a)
         do
@@ -971 +960 @@
         #endif
         libfac_interruptflag=0;
-#else
-        WarnS("complete factorization only for univariate polynomials");
-        if (rField_is_Q_a() ||(!F.isUnivariate())) /* Q(a) */
-        {
-          L = factorize( G );
-        }
-        else
-        {
-          L = factorize( G, a );
-        }
-#endif
       }
     }
@@ -993 +971 @@
       else /* Fp(a) */
       {
-#ifdef HAVE_LIBFAC_P
         L = Factorize( F );
-#else
-        goto notImpl;
-#endif
       }
     }
@@ -1367 +1341 @@
 matrix singclap_irrCharSeries ( ideal I)
 {
-#ifdef HAVE_LIBFAC_P
   if (idIs0(I)) return mpNew(1,1);
 
@@ -1456 +1429 @@
   Off(SW_RATIONAL);
   return res;
-#else
-  return NULL;
-#endif
 }
 
 char* singclap_neworder ( ideal I)
 {
-#ifdef HAVE_LIBFAC_P
   int i;
   Off(SW_RATIONAL);
@@ -1543 +1512 @@
   if (s[strlen(s)-1]==',') s[strlen(s)-1]='\0';
   return s;
-#else
-  return NULL;
-#endif
 }