Changeset 07f3b73 in git

Timestamp:

Sep 9, 2011, 7:54:23 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

2fbc7aa588f89f07aa77851b6807798935528f56

Parents:

3bdd16ec578fa0d4fe5456a1190eef2b72620c24

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-09 19:54:23+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:41+01:00

Message:

FIX: Singular builds, runs & does some polynomial arithmetics!!!

Location:

Singular

Files:

• ipshell.cc (modified) (2 diffs)
• tesths.cc (modified) (4 diffs)

Singular/ipshell.cc

@@ -1512 +1512 @@
   if (tmp==NULL) return NULL;
 
-  if ((currRing->ppNoether)!=NULL) pDelete(&(currRing->ppNoether));
+// if ((currRing->ppNoether)!=NULL) pDelete(&(currRing->ppNoether));
   if (sLastPrinted.RingDependend())
   {
@@ -1521 +1521 @@
   ring r = IDRING(tmp);
 
-  r->cf->ch = 32003;
+  r->cf = nInitChar(n_Zp, (void*)32003); //   r->cf->ch = 32003;
   r->N      = 3;
   /*r->P     = 0; Alloc0 in idhdl::set, ipid.cc*/

Singular/tesths.cc

@@ -8 +8 @@
 */
 
+#include <kernel/mod2.h>
+
+#include <omalloc/omalloc.h>
+
 #include <misc/options.h>
 #include <misc/auxiliary.h>
+
 #ifdef HAVE_FACTORY
 #define SI_DONT_HAVE_GLOBAL_VARS
@@ -15 +20 @@
 #endif
 
-#include <kernel/mod2.h>
-#include <Singular/tok.h>
+#include <kernel/febase.h>
+#include <kernel/timer.h>
+#include <kernel/fegetopt.h>
+
+#ifdef HAVE_FANS
+#include <kernel/bbcone.h>
+#include <kernel/bbfan.h>
+#endif
+
+#include "ipshell.h"
+#include "cntrlc.h"
+#include "silink.h"
+#include "ipid.h"
+#include "sdb.h"
+#include "feOpt.h"
+#include "distrib.h"
+#include "version.h"
+#include "slInit.h"
+#include "ssiLink.h"
+#include "bigintm.h"
+#include "bbcone.h"
+#include "mmalloc.h"
+#include "tok.h"
+
+// #include "pyobject_setup.h"
+
 #include <unistd.h>
 #include <string.h>
@@ -24 +53 @@
 #include <errno.h>
 
-#include <Singular/ipshell.h>
-#include <kernel/febase.h>
-#include <Singular/cntrlc.h>
-#include <omalloc/omalloc.h>
-#include <Singular/silink.h>
-#include <Singular/ipid.h>
-#include <kernel/timer.h>
-#include <Singular/sdb.h>
-#include <kernel/fegetopt.h>
-#include "feOpt.h"
-#include <Singular/distrib.h>
-#include <Singular/version.h>
-#include <Singular/slInit.h>
-#include <Singular/ssiLink.h>
-#include <Singular/bigintm.h>
-#include <Singular/pyobject_setup.h>
-#include <omalloc/omalloc.h>
-#include <kernel/mmalloc.h>
-
-#ifdef HAVE_FANS
-#include <kernel/bbcone.h>
-#include <kernel/bbfan.h>
-#endif
 
 
@@ -52 +58 @@
 
 #if ! defined(LIBSINGULAR)
+
+#ifdef HAVE_FACTORY
+int initializeGMP(){ return 1; }
+#endif
+
 int mmInit2( void )
 {