Changeset 3645fc in git for Singular/misc_ip.cc

Timestamp:

Jun 8, 2011, 6:45:40 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

b9a4477dffa95152122f8354bb7633b5a708918e

Parents:

ac8e1a6fb7da54fe20dd3b5cb75e2f2cdd68dc06

Message:

init via siInit

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

File:

• Singular/misc_ip.cc (modified) (5 diffs)

Singular/misc_ip.cc

@@ -21 +21 @@
 #include <kernel/longrat.h>
 #include <Singular/misc_ip.h>
-#ifdef LIBSINGULAR
+#include <Singular/feOpt.h>
 #include <Singular/silink.h>
-#include <Singular/feOpt.h>
-#endif
 
 void number2mpz(number n, mpz_t m)
@@ -1126 +1124 @@
 }
 
-#ifdef LIBSINGULAR
 int siInit(char *name)
 {
-
+#ifdef HAVE_FACTORY
+  On(SW_USE_NTL);
+  Off(SW_USE_GCD_P);
+  On(SW_USE_NTL_GCD_0); // On -> seg11 in Old/algnorm, Old/factor...
+  On(SW_USE_NTL_GCD_P); // On -> cyle in Short/brnoeth_s: fixed
+  On(SW_USE_EZGCD);
+  On(SW_USE_CHINREM_GCD);
+  //On(SW_USE_FF_MOD_GCD);
+  //On(SW_USE_fieldGCD);
+  On(SW_USE_EZGCD_P);
+  On(SW_USE_QGCD);
+  Off(SW_USE_NTL_SORT); // may be changed by an command line option
+#endif
+
+#ifdef INIT_BUG
+  jjInitTab1();
+#endif
+  /* initialize components */
+  factoryError=WerrorS;
+  siRandomStart=inits();
+  feOptSpec[FE_OPT_RANDOM].value = (void*) ((long)siRandomStart);
+
+  // Don't worry: ifdef OM_NDEBUG, then all these calls are undef'ed
   // hack such that all shared' libs in the bindir are loaded correctly
   feInitResources(name);
@@ -1135 +1154 @@
   iiInitArithmetic();
 
-#if 0
-  SingularBuilder::Ptr SingularInstance = SingularBuilder::instance();
-#else
   basePack=(package)omAlloc0(sizeof(*basePack));
   currPack=basePack;
@@ -1149 +1165 @@
   slStandardInit();
   myynest=0;
-#endif
+
   if (! feOptValue(FE_OPT_NO_STDLIB))
   {
@@ -1159 +1175 @@
   errorreported = 0;
 }
-#endif
-
+