Changeset 6f1610 in git

Timestamp:

Nov 17, 1999, 1:09:27 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

d6b035db0aca74c2dfaa450b41b81d9ef4adfe0b

Parents:

59f0d2fa7d5c7132b992bffd6be3a4a07eeb4b9b

Message:

* ideals: fix in idModulo
* k* fix initSSpecial
* mmbt: don't track on new


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

Location:

Singular

Files:

• ideals.cc (modified) (4 diffs)
• kstd2.cc (modified) (4 diffs)
• kstdfac.cc (modified) (10 diffs)
• kutil.cc (modified) (9 diffs)
• kutil.h (modified) (2 diffs)
• mmbt.c (modified) (3 diffs)
• mminit.cc (modified) (2 diffs)

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.74 1999-11-16 12:39:27 obachman Exp $ */
+/* $Id: ideals.cc,v 1.75 1999-11-17 12:09:24 obachman Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2918 +2918 @@
   if (syz_ring != orig_ring)
   {
-    s_temp = idrCopyR_NoSort(temp, orig_ring);
+    s_temp = idrMoveR_NoSort(temp, orig_ring);
   }
   else
@@ -2925 +2925 @@
   }
   
+  idTest(s_temp);
   ideal s_temp1 = kStd(s_temp,currQuotient,testHomog,&w,NULL,length);
   if (w!=NULL) delete w;
@@ -2946 +2947 @@
   {
     rChangeCurrRing(orig_ring,TRUE);
-    s_temp = idrMoveR_NoSort(s_temp, syz_ring);
+    s_temp1 = idrMoveR_NoSort(s_temp1, syz_ring);
+    rKill(syz_ring);
+  }
+  else
+  {
     idDelete(&temp);
-    rKill(syz_ring);
-  }
+  }
+  idTest(s_temp1);
   return s_temp1;
 }

Singular/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.39 1999-11-15 17:20:15 obachman Exp $ */
+/* $Id: kstd2.cc,v 1.40 1999-11-17 12:09:25 obachman Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -582 +582 @@
   reduc = olddeg = lrmax = 0;
   /* compute------------------------------------------------------- */
+  kTest_TS(strat);
   while (strat->Ll >= 0)
   {
@@ -617 +618 @@
               &olddeg,&reduc,strat);
 
+    kTest_TS(strat);
     /* reduction of the element choosen from L */
     red_result = strat->red(&strat->P,strat);
@@ -623 +625 @@
     if (red_result == 1)
     {
+      kTest_TS(strat);
       /* statistic */
       if (TEST_OPT_PROT) PrintS("s");

Singular/kstdfac.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstdfac.cc,v 1.30 1999-11-15 17:20:15 obachman Exp $ */
+/* $Id: kstdfac.cc,v 1.31 1999-11-17 12:09:25 obachman Exp $ */
 /*
 *  ABSTRACT -  Kernel: factorizing alg. of Buchberger
@@ -102 +102 @@
       if(i>o->tl)
       {
-        PrintS("poly p1 not found in T:");wrp(p);PrintLn();
+        Warn("poly p1 not found in T:");wrp(p);PrintLn();
         l[j].p1=pCopy(p);
         break;
@@ -122 +122 @@
       if(i>o->tl)
       {
-        PrintS("poly p2 not found in T:");wrp(p);PrintLn();
+        Warn("poly p2 not found in T:");wrp(p);PrintLn();
         l[j].p2=pCopy(p);
         break;
@@ -149 +149 @@
 kStrategy kStratCopy(kStrategy o)
 {
+  kTest_TS(o);
   kStrategy s=(kStrategy)Alloc0SizeOf(skStrategy);
   s->next=NULL;
@@ -220 +221 @@
   s->fromT=o->fromT;
   s->noetherSet=o->noetherSet;
+  kTest_TS(s);
   return s;
 }
@@ -251 +253 @@
     int facdeg=pFDeg(strat->S[si]);
 
-    kTest(strat);
     ideal fac=singclap_factorize(strat->S[si],NULL,1);
-    kTest(strat);
 #ifndef HAVE_LIBFAC_P
     if (fac==NULL)
@@ -462 +462 @@
     if (TEST_OPT_REDSB) completeReduceFac(strat,FL);
   }
+  kTest_TS(strat);
   while (strat->Ll >= 0)
   {
@@ -484 +485 @@
     strat->P = strat->L[strat->Ll];
     strat->Ll--;
-    kTest(strat);
     if (pNext(strat->P.p) == strat->tail)
     {
@@ -741 +741 @@
         }
       } /* for */
-    kTest(strat);
       for(i=0;i<IDELEMS(fac);i++) fac->m[i]=NULL;
       idDelete(&fac);
@@ -753 +752 @@
       if (TEST_OPT_REDSB) completeReduceFac(strat,FL);
     }
-    kTest(strat);
+    kTest_TS(strat);
   }
   if (TEST_OPT_DEBUG) messageSets(strat);

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.49 1999-11-15 17:20:16 obachman Exp $ */
+/* $Id: kutil.cc,v 1.50 1999-11-17 12:09:26 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -309 +309 @@
   BOOLEAN ret = TRUE;
   // test P
-#ifdef MDEBUG
-  if (pref >= 2) mmStartReferenceWatch();
-#endif
   ret = K_Test_L(f, l, &(strat->P),
                  (strat->P.p != NULL && pNext(strat->P.p) != strat->tail),
@@ -324 +321 @@
   if (strat->T != NULL)
   {
-#ifdef MDEBUG
-    if (pref && pref <= 1) mmStartReferenceWatch();
-#endif
     for (i=0; i<=strat->tl; i++)
     {
@@ -335 +329 @@
     }
   }
-#ifdef MDEBUG
-  if (pref) mmStopReferenceWatch();
-#endif
   // test L
   if (strat->L != NULL)
@@ -403 +394 @@
 
 
+int kFindInT(poly p, TSet T, int tlength)
+{
+  int i;
+  
+  for (i=0; i<=tlength; i++)
+  {
+    if (T[i].p == p) return i;
+  }
+  return -1;
+}
+
 
 BOOLEAN K_Test_TS(char *f, int l, kStrategy strat)
@@ -415 +417 @@
     for (i=0; i<=strat->sl; i++)
     {
-      for (j=0; j<=strat->tl; j++)
-        if (strat->S[i] == strat->T[j].p) break;
-      if (j > strat->tl)
+      if (kFindInT(strat->S[i], strat->T, strat->tl) < 0)
       {
         Warn("S[%d] not in T", i);
@@ -593 +593 @@
 void enterOnePair (int i,poly p,int ecart, int isFromQ,kStrategy strat)
 {
+  assume(i<=strat->sl);
+
   int      l,j,compare;
   LObject  Lp;
@@ -601 +603 @@
   /*- computes the lcm(s[i],p) -*/
   Lp.lcm = pInit();
+
   pLcm(p,strat->S[i],Lp.lcm);
   pSetm(Lp.lcm);
@@ -2706 +2709 @@
           h.sev = pGetShortExpVector(h.p);
           strat->enterS(h,pos,strat);
+          enterT(h, strat);
           strat->fromQ[pos]=1;
         }

Singular/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.22 1999-11-15 17:20:17 obachman Exp $ */
+/* $Id: kutil.h,v 1.23 1999-11-17 12:09:27 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -179 +179 @@
 #ifdef KDEBUG
 #define kTest(A) K_Test(__FILE__,__LINE__,A)
-#define kTest_TS(A) K_Test(__FILE__,__LINE__,A)
+#define kTest_TS(A) K_Test_TS(__FILE__,__LINE__,A)
 #define kTest_T(T) K_Test_T(__FILE__,__LINE__,T)
 #define kTest_L(L) K_Test_L(__FILE__,__LINE__,L)

Singular/mmbt.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmbt.c,v 1.21 1999-11-15 17:20:23 obachman Exp $ */
+/* $Id: mmbt.c,v 1.22 1999-11-17 12:09:27 obachman Exp $ */
 /*
 * ABSTRACT: backtrace: part of memory subsystem (for linux/elf)
@@ -111 +111 @@
 }
 
+int mm_no_mtrack = 0;
+
 void mmTrack (unsigned long *bt_stack)
 {
@@ -121 +123 @@
 
   if (mm_lowpc==0) mmTrackInit();
-
-  while ((fp!=NULL) && ((unsigned long)fp>4095)
-  && ((unsigned long)fp < ((unsigned long)0xff000000))
-  && *fp && (pc = getpc (fp))
-  && !entrypc (pc) && (i<BT_MAXSTACK))
-  {
-    if ( mmTrack_sig11_caught) break;
-    bt_stack[i]=pc; i++;
-    fp = (unsigned long *) *fp;
+  
+  if (! mm_no_mtrack)
+  {
+    while ((fp!=NULL) && ((unsigned long)fp>4095)
+           && ((unsigned long)fp < ((unsigned long)0xff000000))
+           && *fp && (pc = getpc (fp))
+           && !entrypc (pc) && (i<BT_MAXSTACK))
+    {
+      if ( mmTrack_sig11_caught) break;
+      bt_stack[i]=pc; i++;
+      fp = (unsigned long *) *fp;
+    }
   }
 /*  signal(SIGSEGV, (si_hdl_typ) sig11_handler); */

Singular/mminit.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mminit.cc,v 1.17 1999-11-15 17:20:25 obachman Exp $ */
+/* $Id: mminit.cc,v 1.18 1999-11-17 12:09:27 obachman Exp $ */
 /*
 * ABSTRACT: init of memory management
@@ -29 +29 @@
 {
 #ifdef MDEBUG
-  return mmDBAlloc( size, "new",0);
+  extern int mm_no_mtrack;
+  void* addr;
+  mm_no_mtrack = 1;
+  addr = mmDBAlloc( size, "new",0);
+  mm_no_mtrack = 0;
+  return addr;
 #else
   return AllocL( size );