Changeset dc4782 in git for kernel

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

Location:

kernel

Files:

• fglm.h (modified) (2 diffs)
• fglmcomb.cc (modified) (2 diffs)
• fglmgauss.cc (modified) (2 diffs)
• fglmvec.cc (modified) (2 diffs)
• fglmzero.cc (modified) (2 diffs)
• ideals.cc (modified) (4 diffs)
• kstdfac.cc (modified) (4 diffs)
• misc.cc (modified) (1 diff)
• test.cc (modified) (2 diffs)

kernel/fglm.h

@@ -12 +12 @@
 #ifndef FGLM_H
 #define FGLM_H
-
-#ifdef HAVE_FACTORY
 
 #include <kernel/polys.h>
@@ -86 +84 @@
 
 #endif
-#endif

kernel/fglmcomb.cc

@@ -13 +13 @@
 #include <kernel/mod2.h>
 
-#ifdef HAVE_FACTORY
 #define SI_DONT_HAVE_GLOBAL_VARS
 #include <factory/factory.h>
@@ -554 +553 @@
 }
 
-#endif
 // Local Variables: ***
 // compile-command: "make Singular" ***

kernel/fglmgauss.cc

@@ -14 +14 @@
 #include <kernel/mod2.h>
 
-#ifdef  HAVE_FACTORY
 #include <kernel/structs.h>
 #include <coeffs/numbers.h>
@@ -211 +210 @@
 // fold-internal-margins: nil ***
 // End: ***
-#endif // HAVE_FACTORY

kernel/fglmvec.cc

@@ -17 +17 @@
 #include <kernel/mod2.h>
 
-#ifdef HAVE_FACTORY
 #include <omalloc/omalloc.h>
 #include <kernel/structs.h>
@@ -532 +531 @@
 }
 
-#endif
 // ----------------------------------------------------------------------------
 // Local Variables: ***

kernel/fglmzero.cc

@@ -24 +24 @@
 
 
-#ifdef HAVE_FACTORY
 // assumes, that NOSTREAMIO is set in factoryconf.h, which is included
 // by templates/list.h.
@@ -1253 +1252 @@
 
 
-#endif
-
 // ----------------------------------------------------------------------------
 // Local Variables: ***

kernel/ideals.cc

@@ -2364 +2364 @@
 #include <polys/clapsing.h>
 
-#ifdef HAVE_FACTORY
 #if 0
 poly id_GCD(poly f, poly g, const ring r)
@@ -2398 +2397 @@
 }
 #endif
-#endif
 
 #if 0
@@ -2408 +2406 @@
 * destroys xx
 */
-#ifdef HAVE_FACTORY
 ideal id_ChineseRemainder(ideal *xx, number *q, int rl, const ring R)
 {
@@ -2468 +2465 @@
 }
 #endif
-#endif
 /* currently unsed:
 ideal idChineseRemainder(ideal *xx, intvec *iv)

kernel/kstdfac.cc

@@ -22 +22 @@
 //#include "ipshell.h"
 #include <misc/intvec.h>
-#ifdef HAVE_FACTORY
 #include <polys/clapsing.h>
-#endif
 #include <kernel/ideals.h>
 #include <kernel/timer.h>
 #include <kernel/kstdfac.h>
-
-#ifdef HAVE_FACTORY
 
 #ifndef NDEBUG
@@ -257 +253 @@
   ideal fac=singclap_factorize(pCopy(p),NULL,1,currRing);
   int fac_elems;
-#ifndef HAVE_FACTORY
-  if (fac==NULL)
-  {
-    fac=idInit(1,1);
-    fac->m[0]=pCopy(p);
-    fac_elems=1;
-  }
-  else
-#endif
-    fac_elems=IDELEMS(fac);
+  fac_elems=IDELEMS(fac);
   rfac=fac;
   fac_copy=idInit(fac_elems,1);
@@ -889 +876 @@
   return (strat->Shdl);
 }
-#endif
 
 ideal_list kStdfac(ideal F, ideal Q, tHomog h,intvec ** w,ideal D)
 {
-#ifdef HAVE_FACTORY
   ideal r;
   BOOLEAN b=currRing->pLexOrder,toReset=FALSE;
@@ -1040 +1025 @@
   if ((delete_w)&&(w!=NULL)&&(*w!=NULL)) delete *w;
   return L;
-#else
-  return NULL;
-#endif
 }

kernel/misc.cc

@@ -11 +11 @@
 #include <kernel/mod2.h>
 
-#ifdef HAVE_FACTORY
 #define SI_DONT_HAVE_GLOBAL_VARS
 #  include <factory/factory.h>
 /* libfac version strings */
-#ifdef HAVE_LIBFAC
-//  extern const char * libfac_version;
-//  extern const char * libfac_date;
-#endif // #ifdef HAVE_LIBFAC
-#endif
 
 #include <coeffs/si_gmp.h>

kernel/test.cc

@@ -6 +6 @@
 #include <omalloc/omalloc.h>
 #include <misc/auxiliary.h>
-#ifdef HAVE_FACTORY
 #include <factory/factory.h> // :(
-#endif
 
 #include <misc/intvec.h>
@@ -53 +51 @@
 
 
-#ifdef HAVE_FACTORY
 // The following are needed due to FACTORY (e.g. initCanonicalForm)
 int initializeGMP(){ return 1; }
 int mmInit(void) {return 1; }
-#endif
 
 // // TODO: DUE to the use of HALT in npolygon.cc :(((