Changeset 1f1fb0 in git

Timestamp:

Jan 21, 2013, 4:58:03 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

b4ecd22b9bdea4a7363a92025f6b381893dd49e1

Parents:

5b32a17feb4f0be885f1224b99e80004ed814aabe9caeb23e27bc7fab621c6235aab294ec4f32681

Message:

Merge branch 'spielwiese' into sw_fix

* spielwiese:
  add: names(int level) added
  chg: change omAlloc policy: OM_DEFAULT_PAGES_PER_REGION to 512 (2 MB)
  fix: porting singnal handling (win, etc.)
  add: option(noredefine) also for export

Files:

• Singular/LIB/dmod.lib (modified) (2 diffs)
• Singular/LIB/finvar.lib (modified) (1 diff)
• Singular/cntrlc.cc (modified) (1 diff)
• Singular/ipid.cc (modified) (1 diff)
• Singular/ipid.h (modified) (1 diff)
• Singular/iplib.cc (modified) (1 diff)
• kernel/kutil.cc (modified) (1 diff)
• libpolys/polys/ext_fields/algext.cc (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (3 diffs)
• omalloc/omDefaultConfig.h (modified) (1 diff)

Singular/LIB/dmod.lib

@@ -1721 +1721 @@
   dbprint(ppl-1, @R4);
   ideal K4 = imap(@R2,K2);
+  intvec saveopt=option(get);
   option(redSB);
   dbprint(ppl,"// -3-2- the final cosmetic std");
@@ -1731 +1732 @@
   ideal LD = K4;
   export LD;
+  option(set,saveopt);
   return(@R4);
 }

Singular/LIB/finvar.lib

@@ -6462 +6462 @@
   int dgb=degBound;
   degBound = 0;
+  intvec saveopt=option(get);
   option(redSB);
   ideal sP = groebner(ideal(P));

Singular/cntrlc.cc

@@ -563 +563 @@
 void init_signals()
 {
+  #ifdef SIGSEGV
   si_set_signal(SIGSEGV,(si_hdl_typ)sigsegv_handler);
+  #endif
+  #ifdef SIGBUS
+  si_set_signal(SIGBUS, (si_hdl_typ)sigsegv_handler);
+  #endif
+  #ifdef SIGFPE
   si_set_signal(SIGFPE, (si_hdl_typ)sigsegv_handler);
+  #endif
+  #ifdef SIGILL
   si_set_signal(SIGILL, (si_hdl_typ)sigsegv_handler);
+  #endif
+  #ifdef SIGIOT
   si_set_signal(SIGIOT, (si_hdl_typ)sigsegv_handler);
+  #endif
   si_set_signal(SIGINT ,(si_hdl_typ)sigint_handler);
   si_set_signal(SIGCHLD, (si_hdl_typ)sig_chld_hdl);

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
+
 /*
 * ABSTRACT: identfier handling

Singular/ipid.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
+
 /*
 * ABSTRACT: identfier handling

Singular/iplib.cc

@@ -293 +293 @@
   return NULL;
 }
+#ifndef LIBSINGULAR
+// see below:
+struct soptionStruct
+{
+  const char * name;
+  unsigned   setval;
+  unsigned   resetval;
+};
+extern struct soptionStruct optionStruct[];
+extern struct soptionStruct verboseStruct[];
+#endif
 
 BOOLEAN iiAllStart(procinfov pi, char *p,feBufferTypes t, int l)

kernel/kutil.cc

@@ -3507 +3507 @@
   int j = pos;
   if ( (!strat->fromT)
-  && (1//(strat->syzComp==0)
-    //||(pGetComp(h)<=strat->syzComp)))
+  && ((strat->syzComp==0)
+    ||(pGetComp(h)<=strat->syzComp)
   ))
   {

libpolys/polys/ext_fields/algext.cc

@@ -414 +414 @@
   if (aDeg>bDeg) return TRUE;
   if (aDeg<bDeg) return FALSE;
-  return n_Greater(pGetCoeff((poly)a),pGetCoeff((poly)b),cf);
+  return n_Greater(pGetCoeff((poly)a),pGetCoeff((poly)b),naCoeffs);
 }
 

libpolys/polys/ext_fields/transext.cc

@@ -608 +608 @@
   ntTest(a);
   ntTest(b);
-  number aNumCoeff = NULL; int aNumDeg = 0;
-  number bNumCoeff = NULL; int bNumDeg = 0;
+  number aNumCoeff = NULL; int aNumDeg = -1;
+  number bNumCoeff = NULL; int bNumDeg = -1;
   if (!IS0(a))
   {
@@ -616 +616 @@
     aNumCoeff = p_GetCoeff(NUM(fa), ntRing);
   }
+  else return !(ntGreaterZero (b,cf));
   if (!IS0(b))
   {
@@ -622 +623 @@
     bNumCoeff = p_GetCoeff(NUM(fb), ntRing);
   }
+  else return ntGreaterZero(a,cf);
   if (aNumDeg > bNumDeg) return TRUE;
   if (aNumDeg < bNumDeg) return FALSE;

omalloc/omDefaultConfig.h

@@ -89 +89 @@
 */
 #ifndef OM_DEFAULT_PAGES_PER_REGION
-#define OM_DEFAULT_PAGES_PER_REGION 128
+#define OM_DEFAULT_PAGES_PER_REGION 512
 #endif