Changeset dc4782 in git for Singular/iparith.cc

Timestamp:

Nov 25, 2013, 4:49:42 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

98e588265496a69b639a1e37bf39d39134a6df5f

Parents:

7bb7da5db82ebe13b1923654fb861e84c6c3ec65

Message:

chg: factory/libfac is not optional, removing HAVE_FACTORY/HAVE_LIBFAC

File:

• Singular/iparith.cc (modified) (28 diffs)

Singular/iparith.cc

@@ -68 +68 @@
 #include <Singular/linearAlgebra_ip.h>
 
-#ifdef HAVE_FACTORY
 #  include <factory/factory.h>
 #  include <polys/clapsing.h>
@@ -74 +73 @@
 #  include <kernel/fglm.h>
 #  include <Singular/fglm.h>
-#endif /* HAVE_FACTORY */
 
 #include <Singular/interpolation.h>
@@ -1215 +1213 @@
   { /* This means that q != 0 consists of at least two terms.
        Moreover, currRing is over a field. */
-#ifdef HAVE_FACTORY
     if(pGetComp(p)==0)
     {
@@ -1253 +1250 @@
       res->data=(void *)p;
     }
-#else /* HAVE_FACTORY */
-    WerrorS("division only by a monomial");
-    return TRUE;
-#endif /* HAVE_FACTORY */
   }
   else
@@ -1297 +1290 @@
       if (pNext(q)!=NULL)
       {
-      #ifdef HAVE_FACTORY
         MATELEM(mm,i,j) = singclap_pdivide( MATELEM(m,i,j) ,
                                            q /*(poly)(v->Data())*/, currRing );
-#else /* HAVE_FACTORY */
-        WerrorS("division only by a monomial");
-        return TRUE;
-#endif /* HAVE_FACTORY */
       }
       else
@@ -1645 +1633 @@
   return FALSE;
 }
-#ifdef HAVE_FACTORY
 static BOOLEAN jjCHINREM_BI(leftv res, leftv u, leftv v)
 {
@@ -1669 +1656 @@
   return FALSE;
 }
-#endif
 #if 0
 static BOOLEAN jjCHINREM_P(leftv res, leftv u, leftv v)
@@ -1733 +1719 @@
 }
 #endif
-#ifdef HAVE_FACTORY
 static BOOLEAN jjCHINREM_ID(leftv res, leftv u, leftv v)
 {
@@ -1867 +1852 @@
   return FALSE;
 }
-#endif
 static BOOLEAN jjCOEF(leftv res, leftv u, leftv v)
 {
@@ -2118 +2102 @@
   return FALSE;
 }
-#ifdef HAVE_FACTORY
 static BOOLEAN jjEXTGCD_P(leftv res, leftv u, leftv v)
 {
@@ -2205 +2188 @@
   return FALSE;
 }
-#endif /* HAVE_FACTORY */
 static BOOLEAN jjFAREY_BI(leftv res, leftv u, leftv v)
 {
@@ -2367 +2349 @@
 static BOOLEAN jjGCD_BI(leftv res, leftv u, leftv v)
 {
-#ifdef HAVE_FACTORY
   number n1 = (number) u->CopyD();
   number n2 = (number) v->CopyD();
@@ -2377 +2358 @@
   res->data = g;
   return FALSE;
-#else
-  number a=(number) u->Data();
-  number b=(number) v->Data();
-  if (n_IsZero(a,coeffs_BIGINT))
-  {
-    if (n_IsZero(b,coeffs_BIGINT)) res->data=(char *)n_Init(1,coeffs_BIGINT);
-    else                           res->data=(char *)n_Copy(b,coeffs_BIGINT);
-  }
-  else
-  {
-    if (n_IsZero(b,coeffs_BIGINT))  res->data=(char *)n_Copy(a,coeffs_BIGINT);
-    else res->data=(char *)n_Gcd(a, b, coeffs_BIGINT);
-  }
-  return FALSE;
-#endif
 }
 static BOOLEAN jjGCD_N(leftv res, leftv u, leftv v)
@@ -2409 +2375 @@
   return FALSE;
 }
-#ifdef HAVE_FACTORY
 static BOOLEAN jjGCD_P(leftv res, leftv u, leftv v)
 {
@@ -2416 +2381 @@
   return FALSE;
 }
-#endif /* HAVE_FACTORY */
 static BOOLEAN jjHILBERT2(leftv res, leftv u, leftv v)
 {
@@ -3330 +3294 @@
   return FALSE;
 }
-#ifdef HAVE_FACTORY
 extern int singclap_factorize_retry;
 static BOOLEAN jjSQR_FREE2(leftv res, leftv u, leftv dummy)
@@ -3379 +3342 @@
   return FALSE;
 }
-#endif
 static BOOLEAN jjSTATUS2(leftv res, leftv u, leftv v)
 {
@@ -3824 +3786 @@
   else if (rField_is_Zp_a(r) && (r->cf->type==n_algExt))
   {
-#ifdef HAVE_FACTORY
     extern int ipower ( int b, int n ); /* factory/cf_util */
     elems=ipower(r->cf->ch,r->cf->extRing->pFDeg(r->cf->extRing->qideal->m[0],r->cf->extRing));
-#else
-    elems=(int)pow((double) r->cf->ch,(double)r->cf->extRing->pFDeg(r->cf->extRing->qideal->m[0],r->cf->extRing));
-#endif
   }
   res->data = (char *)(long)elems;
@@ -3920 +3878 @@
 }
 
-
-
-
-#ifdef HAVE_FACTORY
 static BOOLEAN jjDET(leftv res, leftv v)
 {
@@ -3983 +3937 @@
   return FALSE;
 }
-#endif
 static BOOLEAN jjDIM(leftv res, leftv v)
 {
@@ -4055 +4008 @@
   return yyparse();
 }
-#ifdef HAVE_FACTORY
 static BOOLEAN jjFACSTD(leftv res, leftv v)
 {
@@ -4112 +4064 @@
   return FALSE;
 }
-#endif
 static BOOLEAN jjGETDUMP(leftv, leftv v)
 {
@@ -5010 +4961 @@
   return FALSE;
 }
-#ifdef HAVE_FACTORY
 static BOOLEAN jjSQR_FREE(leftv res, leftv u)
 {
@@ -5027 +4977 @@
   return FALSE;
 }
-#endif
 #if 1
 static BOOLEAN jjSYZYGY(leftv res, leftv v)
@@ -5357 +5306 @@
         case (int)jjidElem:       dArith1[i].p=(proc1)idElem; break;
         case (int)jjidVec2Ideal:  dArith1[i].p=(proc1)idVec2Ideal; break;
-#ifndef HAVE_FACTORY
         case (int)jjmpDetBareiss: dArith1[i].p=(proc1)mpDetBareiss; break;
-#endif
         case (int)jjidFreeModule: dArith1[i].p=(proc1)idFreeModule; break;
         case (int)jjrCharStr:     dArith1[i].p=(proc1)rCharStr; break;
@@ -7536 +7483 @@
                                                 optional: all 4 optional args
      (The defaults are xIndex = 1, yIndex = 2, f0 and g0 polynomials as found
-      by singclap_factorize in the case that HAVE_FACTORY is defined and h(0, y)
+      by singclap_factorize and h(0, y)
       has exactly two distinct monic factors [possibly with exponent > 1].)
      result:
@@ -7625 +7572 @@
   if (factorsGiven == 0)
   {
-#ifdef HAVE_FACTORY
     poly h0 = pSubst(pCopy(h), xIndex, NULL);
     intvec* v = NULL;
@@ -7644 +7590 @@
     g0 = pPower(pCopy(i->m[2]), (*v)[2]);
     idDelete(&i);
-#else
-    WerrorS("cannot factorize h(0,y) due to missing module 'factory'");
-    return TRUE;
-#endif
   }