Changeset 743c32 in git

Timestamp:

Apr 29, 1999, 6:57:18 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'ec94ef7a30b928574c0c3daf41f6804dff5f6b69')

Children:

b98018048375e2844cb029948d521db0a81570d8

Parents:

ce5fb2786eb5fa61fee54f85fe8647ef13e7be20

Message:

* hannes: - OPT_DEBUG revisited
          - fixes to sdb


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

Location:

Singular

Files:

• febase.inc (modified) (6 diffs)
• hutil.cc (modified) (3 diffs)
• iplib.cc (modified) (12 diffs)
• kstd1.cc (modified) (30 diffs)
• kstd2.cc (modified) (26 diffs)
• kutil.cc (modified) (9 diffs)
• misc.cc (modified) (2 diffs)
• sdb.cc (modified) (4 diffs)
• sdb.h (modified) (2 diffs)

Singular/febase.inc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.inc,v 1.22 1999-04-20 17:02:48 Singular Exp $ */
+/* $Id: febase.inc,v 1.23 1999-04-29 16:57:12 Singular Exp $ */
 /*
 * ABSTRACT: handling of 'voices'
@@ -366 +366 @@
 * print echo (si_echo or TRACE), set my_yylinebuf
 */
-static int fePrintEcho(char *anf)
+static int fePrintEcho(char *anf, char *b)
 {
   char *ss=strchr(anf,'\n');
@@ -430 +430 @@
   && (currentVoice->pi->trace_flag!=0))
   {
-    sdb(currentVoice, anf, len_s);
+    sdb(currentVoice, anf, len_s, b);
   }
   prompt_char = '.';
@@ -485 +485 @@
           strncpy(s,anf,len+2);
           s[len+1]='\0';
-          fePrintEcho(s);
+          fePrintEcho(s,b);
           FreeL((ADDRESS)s);
         }
@@ -500 +500 @@
           s[len+1]='\0';
           yylineno++;
-          fePrintEcho(s);
+          fePrintEcho(s,b);
           FreeL((ADDRESS)s);
         }
@@ -541 +541 @@
       fputs(s,feProtFile);
     }
-    int rc=fePrintEcho(s)+1;
+    int rc=fePrintEcho(s,b)+1;
     //s[strlen(s)+1]='\0'; add an second \0 at the end of the string
     s[rc]='\0';

Singular/hutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: hutil.cc,v 1.9 1998-12-08 10:55:19 pohl Exp $ */
+/* $Id: hutil.cc,v 1.10 1999-04-29 16:57:13 Singular Exp $ */
 /*
 * ABSTRACT: Utilities for staircase operations
@@ -142 +142 @@
 }
 
-  
+
 void hComp(scfmon exist, int Nexist, Exponent_t ak, scfmon stc, int *Nstc)
 {
@@ -249 +249 @@
          g -= o;
        else
-         g = o - g;
+         g = o - g;
        if (g > h)
          h = g;

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.54 1999-04-15 17:28:04 Singular Exp $ */
+/* $Id: iplib.cc,v 1.55 1999-04-29 16:57:13 Singular Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -172 +172 @@
     s[procbuflen+head+2] = '\0';
     offset=0;
-    for(i=0;i<=procbuflen+head+2; i++) {
+    for(i=0;i<=procbuflen+head+2; i++)
+    {
       if(s[i]=='\\' &&
-         (s[i+1]=='"' || s[i+1]=='{' || s[i+1]=='}' || s[i+1]=='\\')) {
+         (s[i+1]=='"' || s[i+1]=='{' || s[i+1]=='}' || s[i+1]=='\\'))
+      {
         i++;
         offset++;
@@ -316 +318 @@
   {
     namehdl nshdl;
-    for(nshdl=namespaceroot; nshdl->isroot != TRUE; nshdl = nshdl->next) {
+    for(nshdl=namespaceroot; nshdl->isroot != TRUE; nshdl = nshdl->next)
+    {
       Print("%d lev %d:",nshdl->lev, nshdl->myynest);
       if (nshdl->currRing==NULL) PrintS("NULL");
@@ -603 +606 @@
   lib_types LT;
 
-  for(i=0; suffix[i] != NULL; i++) {
+  for(i=0; suffix[i] != NULL; i++)
+  {
     sprintf(libname, "%s%s", id, suffix[i]);
     *libname = mytolower(*libname);
-    if((LT = type_of_LIB(libname, libnamebuf)) != LT_NONE) {
-      if(!(LoadResult = iiLibCmd(mstrdup(libname), FALSE))) {
+    if((LT = type_of_LIB(libname, libnamebuf)) != LT_NONE)
+    {
+      if(!(LoadResult = iiLibCmd(mstrdup(libname), FALSE)))
+      {
         v->name = iiConvName(libname);
         break;
@@ -813 +819 @@
   }
 #ifdef HAVE_NAMESPACES
-  if (BVERBOSE(V_LOAD_LIB)) {
+  if (BVERBOSE(V_LOAD_LIB))
+  {
     idhdl versionhdl  = namespaceroot->get("version",0);
     if(versionhdl != NULL)
@@ -1041 +1048 @@
          "line", "start", "line", "body", "line", "example");
 #ifdef HAVE_NAMESPACES
-//  for(pl = IDROOT; pl != NULL; pl = IDNEXT(pl)) {
-    for(pl = NSROOT(namespaceroot->root); pl != NULL; pl = IDNEXT(pl)) {
-    if(IDTYP(pl) == PACKAGE_CMD) {
+//  for(pl = IDROOT; pl != NULL; pl = IDNEXT(pl))
+//{
+    for(pl = NSROOT(namespaceroot->root); pl != NULL; pl = IDNEXT(pl))
+    {
+    if(IDTYP(pl) == PACKAGE_CMD)
+    {
       for(h = IDPACKAGE(pl)->idroot; h != NULL; h = IDNEXT(h))
 #else /* HAVE_NAMESPACES */
@@ -1101 +1111 @@
   char *f = NULL;
   if(hl!=NULL) f = strstr(IDSTRING(hl),libname);
-  if( (hl==NULL) || (f == NULL)) {
-    for(lp = this;lp!=NULL;lp=lp->next) {
+  if( (hl==NULL) || (f == NULL))
+  {
+    for(lp = this;lp!=NULL;lp=lp->next)
+    {
       if(strcmp(lp->get(), libname)==0) break;
     }
-    if(lp==NULL) {
+    if(lp==NULL)
+    {
       libstackv ls = (libstack *)Alloc0(sizeof(libstack));
       ls->next = this;
@@ -1133 +1146 @@
 lib_types type_of_LIB(char *newlib, char *libnamebuf)
 {
-  char  buf[HOWMANY+1]; /* one extra for terminating '\0' */
+  char        buf[HOWMANY+1];        /* one extra for terminating '\0' */
   struct stat sb;
   int nbytes = 0;
@@ -1146 +1159 @@
     return LT;
   }
-  if((sb.st_mode & S_IFMT) != S_IFREG) {
+  if((sb.st_mode & S_IFMT) != S_IFREG)
+  {
     goto lib_type_end;
   }
-  if ((nbytes = fread((char *)buf, sizeof(char), HOWMANY, fp)) == -1) {
+  if ((nbytes = fread((char *)buf, sizeof(char), HOWMANY, fp)) == -1)
+  {
     goto lib_type_end;
     /*NOTREACHED*/
@@ -1155 +1170 @@
   if (nbytes == 0)
     goto lib_type_end;
-  else {
-    buf[nbytes++] = '\0';       /* null-terminate it */
-  }
-  if( (strncmp(buf, "\177ELF\01\01\01", 7)==0) && buf[16]=='\03') {
+  else
+  {
+    buf[nbytes++] = '\0';        /* null-terminate it */
+  }
+  if( (strncmp(buf, "\177ELF\01\01\01", 7)==0) && buf[16]=='\03')
+  {
     LT = LT_ELF;
     FreeL(newlib);
@@ -1164 +1181 @@
     goto lib_type_end;
   }
-  if( (strncmp(buf, "\02\020\01\016\05\022@", 7)==0)) {
+  if( (strncmp(buf, "\02\020\01\016\05\022@", 7)==0))
+  {
     LT = LT_HPUX;
     FreeL(newlib);
@@ -1170 +1188 @@
     goto lib_type_end;
   }
-  if(isprint(buf[0]) || buf[0]=='\n') { LT = LT_SINGULAR; goto lib_type_end; }
+  if(isprint(buf[0]) || buf[0]=='\n')
+  { LT = LT_SINGULAR; goto lib_type_end; }
 
   lib_type_end:

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.32 1999-04-29 11:38:45 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.33 1999-04-29 16:57:14 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -102 +102 @@
   if (!TEST_OPT_INTSTRATEGY)
     pNorm(*with);
+  if (TEST_OPT_DEBUG)
+  {
+    PrintS("reduce ");wrp((*h).p); PrintS(" with ");wrp(*with);PrintLn();
+  }
   if (intoT)
   {
@@ -111 +115 @@
   {
     (*h).p = spSpolyRed(*with,(*h).p,strat->kNoether, strat->spSpolyLoop);
+  }
+  if (TEST_OPT_DEBUG)
+  {
+    PrintS("to ");wrp((*h).p);PrintLn();
   }
 }
@@ -132 +140 @@
     if (j > strat->tl)
     {
-      if (TEST_OPT_DEBUG) PrintLn();
       return;
     }
-    if (TEST_OPT_DEBUG) Print("%d",j);
     if (pDivisibleBy1(strat->T[j].p,(*h).p))
     {
       //if (strat->interpt) test_int_std(strat->kIdeal);
-      if (TEST_OPT_DEBUG) PrintS("+");
       /*- compute the s-polynomial -*/
       if (strat->T[j].ecart > (*h).ecart)
@@ -174 +179 @@
       if ((*h).p == NULL)
       {
-        if (TEST_OPT_DEBUG) PrintS(" to 0\n");
         if (h->lcm!=NULL) pFree1((*h).lcm);
         return;
@@ -230 +234 @@
       }
       j = 0;
-      if TEST_OPT_DEBUG PrintLn();
     }
     else
     {
-      if (TEST_OPT_DEBUG) PrintS("-");
       j++;
     }
@@ -258 +260 @@
     if (j > strat->tl)
     {
-      if (TEST_OPT_DEBUG) PrintLn();
       return;
     }
-    if (TEST_OPT_DEBUG) Print("%d",j);
     if (pDivisibleBy1(strat->T[j].p,(*h).p))
     {
       //if (strat->interpt) test_int_std(strat->kIdeal);
-      if (TEST_OPT_DEBUG) PrintS("+");
       /*- compute the s-polynomial -*/
       pi = strat->T[j].p;
@@ -281 +280 @@
         i++;
         if (i > strat->tl) break;
-        if (TEST_OPT_DEBUG) Print("%d",i);
         if ((((strat->T[i]).ecart < ei)
           || (((strat->T[i]).ecart == ei)
@@ -287 +285 @@
           && pDivisibleBy1((strat->T[i]).p,(*h).p))
         {
-          if (TEST_OPT_DEBUG) PrintS("+");
           /*
            * the polynomial to reduce with is now;
@@ -295 +292 @@
           li = strat->T[i].length;
         }
-        else if (TEST_OPT_DEBUG) PrintS("-");
       }
       /*
@@ -329 +325 @@
         }
       }
-      if (TEST_OPT_DEBUG)
-      {
-        wrp(h->p);
-        PrintS(" with ");
-        wrp(pi);
-      }
       doRed(h,&pi,strat->fromT,strat);
       strat->fromT=FALSE;
-      if (TEST_OPT_DEBUG)
-      {
-        PrintS(" to ");
-        wrp(h->p);
-        PrintLn();
-      }
       if ((*h).p == NULL)
       {
@@ -404 +388 @@
     else
     {
-      if (TEST_OPT_DEBUG) PrintS("-");
       j++;
     }
@@ -427 +410 @@
     if (j > strat->tl)
     {
-      if (TEST_OPT_DEBUG) PrintLn();
       return;
     }
-    if (TEST_OPT_DEBUG) Print("%d",j);
     if (pDivisibleBy1(strat->T[j].p,(*h).p))
     {
       //if (strat->interpt) test_int_std(strat->kIdeal);
-      if (TEST_OPT_DEBUG) PrintS("+\n");
       /*
       * the polynomial to reduce with is;
@@ -443 +423 @@
       if (TEST_OPT_DEBUG)
       {
+        PrintS("reduce ");
         wrp(h->p);
         PrintS(" with ");
@@ -453 +434 @@
         PrintS(" to ");
         wrp(h->p);
+        PrintLn();
       }
       if ((*h).p == NULL)
@@ -503 +485 @@
       }
       j = 0;
-      if TEST_OPT_DEBUG PrintLn();
     }
     else
     {
-      if (TEST_OPT_DEBUG) PrintS("-");
       j++;
     }
@@ -531 +511 @@
     if (j > strat->tl)
     {
-      if (TEST_OPT_DEBUG) PrintLn();
       return;
     }
-    if (TEST_OPT_DEBUG) Print("%d",j);
     if (pDivisibleBy1(strat->T[j].p,(*h).p))
     {
       //if (strat->interpt) test_int_std(strat->kIdeal);
-      if (TEST_OPT_DEBUG) PrintS("+");
       /*- compute the s-polynomial -*/
       pi = strat->T[j].p;
@@ -553 +530 @@
         i++;
         if (i > strat->tl) break;
-        if (TEST_OPT_DEBUG) Print("%d",i);
         if (((strat->T[i].ecart < ei)
           || ((strat->T[i].ecart == ei)
@@ -559 +535 @@
         && pDivisibleBy1(strat->T[i].p,(*h).p))
         {
-          if (TEST_OPT_DEBUG) PrintS("+");
           /*
           * the polynomial to reduce with is now:
@@ -566 +541 @@
           ei = strat->T[i].ecart;
           li = strat->T[i].length;
-        }
-        else
-        {
-          if (TEST_OPT_DEBUG) PrintS("-");
         }
       }
@@ -604 +575 @@
         }
       }
-      if (TEST_OPT_DEBUG)
-      {
-        wrp(h->p);
-        PrintS(" with ");
-        wrp(pi);
-      }
       doRed(h,&pi,strat->fromT,strat);
       strat->fromT=FALSE;
-      if (TEST_OPT_DEBUG)
-      {
-        PrintS(" to ");
-        wrp(h->p);
-      }
       if ((*h).p == NULL)
       {
@@ -674 +634 @@
       }
       j = 0;
-      if TEST_OPT_DEBUG PrintLn();
     }
     else
     {
-      if (TEST_OPT_DEBUG) PrintS("-");
       j++;
     }
@@ -705 +663 @@
     if (j > strat->tl)
     {
-      if (TEST_OPT_DEBUG) PrintLn();
       return H.p;
     }
-    if (TEST_OPT_DEBUG) Print("%d",j);
     if (pDivisibleBy1(strat->T[j].p,H.p))
     {
       //if (strat->interpt) test_int_std(strat->kIdeal);
-      if (TEST_OPT_DEBUG) PrintS("+");
       /*- remember the found T-poly -*/
       pi = strat->T[j].p;
@@ -728 +683 @@
         if (j > strat->tl) break;
         if (ei <= H.ecart) break;
-        if (TEST_OPT_DEBUG) Print("%d",j);
         if (((strat->T[j].ecart < ei)
           || ((strat->T[j].ecart == ei)
@@ -734 +688 @@
         && pDivisibleBy1(strat->T[j].p,H.p))
         {
-          if (TEST_OPT_DEBUG) PrintS("+");
           /*
           * the polynomial to reduce with is now;
@@ -742 +695 @@
           li = strat->T[j].length;
         }
-        else
-        {
-          if (TEST_OPT_DEBUG) PrintS("-");
-        }
       }
       /*
@@ -765 +714 @@
         if (H.p == NULL)
         {
-          if (TEST_OPT_DEBUG) PrintS(" to 0\n");
           return NULL;
         }
@@ -777 +725 @@
         if (H.p == NULL)
         {
-          if (TEST_OPT_DEBUG) PrintS(" to 0\n");
           return NULL;
         }
@@ -789 +736 @@
     else
     {
-      if (TEST_OPT_DEBUG) PrintS("-");
       j++;
     }
@@ -1352 +1298 @@
       while ((strat->Ll >= 0)
         && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p)> Kstd1_deg)
-        && (strat->L[strat->Ll].p1!=NULL) && (strat->L[strat->Ll].p2!=NULL))
+        && (strat->L[strat->Ll].p1!=NULL) && (strat->L[strat->Ll].p2!=NULL))
       {
         deleteInL(strat->L,&strat->Ll,strat->Ll,strat);

Singular/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.24 1999-04-29 11:38:46 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.25 1999-04-29 16:57:15 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -72 +72 @@
         if ((strat->L[i].p1==strat->P.p1) || (strat->L[i].p2==strat->P.p1))
         {
-//PrintS("#");
           deleteInL(strat->L,&strat->Ll,i,strat);
         }
@@ -85 +84 @@
     PrintS("red:");
     wrp(h->p);
-    PrintS(" ");
   }
   loop
   {
-    if (TEST_OPT_DEBUG) Print("%d",j);
     if (pDivisibleBy(strat->S[j],(*h).p))
     {
-      if (TEST_OPT_DEBUG)
-      {
-        PrintS("+\nwith ");
-        wrp(strat->S[j]);
-      }
       if ((!exchanged) && (pEqual((*h).p,strat->S[j])))
       {
-//PrintS("@");
         q = kFromInput(strat->S[j],strat);
         if (q!=NULL)
         {
-//Print("%d*",pGetComp(q));
           exchanged = TRUE;
           p = strat->S[j];
@@ -126 +116 @@
       //if (strat->interpt) test_int_std(strat->kIdeal);
       /*- compute the s-polynomial -*/
+      if (TEST_OPT_DEBUG)
+      {
+        PrintS(" with ");
+        wrp(strat->S[j]);
+      }
       (*h).p = spSpolyRed(strat->S[j],(*h).p,strat->kNoether,
                           strat->spSpolyLoop);
+      if (TEST_OPT_DEBUG)
+      {
+        PrintS("\nto "); wrp((*h).p);PrintLn();
+      }
       if ((*h).p == NULL)
       {
-        if (TEST_OPT_DEBUG) PrintS(" to 0\n");
         if (h->lcm!=NULL) pFree1((*h).lcm);
 #ifdef KDEBUG
@@ -148 +146 @@
           if (pGetComp((*h).p) > strat->syzComp)
           {
-//PrintS("syz");
             pDelete(&((*h).p));
             return;
@@ -156 +153 @@
             if (!TEST_OPT_INTSTRATEGY)
             {
-//PrintS("r");
               pos = posInS(strat->S,strat->sl,(*h).p);
               pNorm((*h).p);
@@ -186 +182 @@
 *  and the case of a degree-ordering
 */
-static reductions = 0;
 
 static void redHomog (LObject* h,kStrategy strat)
@@ -198 +193 @@
   int j = 0;
 
-  if (TEST_OPT_DEBUG)
-  {
-    PrintS("red:");
-    wrp(h->p);
-    PrintS(" ");
-  }
   if (strat->ak!=0)
   {
     loop
       {
-        if (TEST_OPT_DEBUG) Print("%d",j);
         if (pDivisibleBy1(strat->S[j],(*h).p))
         {
-          reductions++;
-          if (TEST_OPT_DEBUG)
-          {
-            Print("+\n%d:with ", reductions);
-            wrp(strat->S[j]);
-          }
           //if (strat->interpt) test_int_std(strat->kIdeal);
           /*- compute the s-polynomial -*/
+          if (TEST_OPT_DEBUG)
+          {
+            PrintS("red:");
+            wrp(h->p);
+            PrintS(" with ");
+            wrp(strat->S[j]);
+          }
           (*h).p = spSpolyRed(strat->S[j],(*h).p,strat->kNoether,
                               strat->spSpolyLoop);
+          if (TEST_OPT_DEBUG)
+          {
+            PrintS("\nto ");
+            wrp(h->p);
+            PrintLn();
+          }
           if ((*h).p == NULL)
           {
-            if (TEST_OPT_DEBUG) PrintS(" to 0\n");
             if (h->lcm!=NULL) pFree1((*h).lcm);
 #ifdef KDEBUG
@@ -248 +242 @@
     loop
       {
-        if (TEST_OPT_DEBUG) Print("%d",j);
         if (pDivisibleBy2(strat->S[j],(*h).p))
         {
-          reductions++;
-          if (TEST_OPT_DEBUG)
-          {
-            Print("+\n%d:with ",reductions);
-            wrp(strat->S[j]);
-          }
           //if (strat->interpt) test_int_std(strat->kIdeal);
           /*- compute the s-polynomial -*/
+          if (TEST_OPT_DEBUG)
+          {
+            PrintS("red:");
+            wrp(h->p);
+            PrintS(" with ");
+            wrp(strat->S[j]);
+          }
           (*h).p = spSpolyRed(strat->S[j],(*h).p,strat->kNoether,
                               strat->spSpolyLoop);
+          if (TEST_OPT_DEBUG)
+          {
+            PrintS("\nto ");
+            wrp(h->p);
+            PrintLn();
+          }
           if ((*h).p == NULL)
           {
-            if (TEST_OPT_DEBUG) PrintS(" to 0\n");
             if (h->lcm!=NULL) pFree1((*h).lcm);
 #ifdef KDEBUG
@@ -269 +268 @@
 #endif
             return;
-          }
-          if (TEST_OPT_DEBUG)
-          {
-            Print(" to %d:", pLength((*h).p));
-            wrp((*h).p);
-            PrintS("\n");
           }
           j = 0;
@@ -306 +299 @@
   int k = 0;
 
-  if (TEST_OPT_DEBUG)
-  {
-    PrintS("red:");
-    wrp(h->p);
-    PrintS(" ");
-  }
   if (strat->ak)
   {
     loop
       {
-        if (TEST_OPT_DEBUG) Print("%d",j);
         if (pDivisibleBy1(strat->T[j].p,(*h).p))
         {
           //if (strat->interpt) test_int_std(strat->kIdeal);
+          /*- compute the s-polynomial -*/
           if (TEST_OPT_DEBUG)
           {
-            PrintS("+\nwith ");
-            wrp(strat->S[j]);
-          }
-          /*- compute the s-polynomial -*/
+            PrintS("red:");
+            wrp(h->p);
+            PrintS(" with ");
+            wrp(strat->T[j].p);
+          }
           (*h).p = spSpolyRed(strat->T[j].p,(*h).p,strat->kNoether,
                               strat->spSpolyLoop);
+          if (TEST_OPT_DEBUG)
+          {
+            PrintS("\nto ");
+            wrp(h->p);
+            PrintLn();
+          }
           if ((*h).p == NULL)
           {
-            if (TEST_OPT_DEBUG) PrintS(" to 0\n");
             if (h->lcm!=NULL) pFree1((*h).lcm);
 #ifdef KDEBUG
@@ -362 +355 @@
 
         // no module component
-        if (TEST_OPT_DEBUG) Print("%d",j);
         if (pDivisibleBy2(strat->T[j].p,(*h).p))
         {
           //if (strat->interpt) test_int_std(strat->kIdeal);
+          /*- compute the s-polynomial -*/
           if (TEST_OPT_DEBUG)
           {
-            PrintS("+\nwith ");
-            wrp(strat->S[j]);
-          }
-          /*- compute the s-polynomial -*/
+            PrintS("red:");
+            wrp(h->p);
+            PrintS(" with ");
+            wrp(strat->T[j].p);
+          }
           (*h).p = spSpolyRed(strat->T[j].p,(*h).p,strat->kNoether,
                               strat->spSpolyLoop);
+          if (TEST_OPT_DEBUG)
+          {
+            PrintS("\nto ");
+            wrp(h->p);
+            PrintLn();
+          }
           if ((*h).p == NULL)
           {
-            if (TEST_OPT_DEBUG) PrintS(" to 0\n");
             if (h->lcm!=NULL) pFree1((*h).lcm);
 #ifdef KDEBUG
@@ -422 +421 @@
   int reddeg = pFDeg((*h).p);
 
-  if (TEST_OPT_DEBUG)
-  {
-    PrintS("red:");
-    wrp(h->p);
-    PrintS(" ");
-  }
   loop
   {
@@ -433 +426 @@
     {
       //if (strat->interpt) test_int_std(strat->kIdeal);
+      /*- compute the s-polynomial -*/
       if (TEST_OPT_DEBUG)
       {
-        Print("\nwith S[%d] ",j);
-        wrp(strat->S[j]);
-      }
-      /*- compute the s-polynomial -*/
+        PrintS("red:");
+        wrp(h->p);
+        PrintS(" with ");
+        wrp(strat->T[j].p);
+      }
       (*h).p = spSpolyRed(strat->S[j],(*h).p,strat->kNoether
                           , strat->spSpolyLoop);
+      if (TEST_OPT_DEBUG)
+      {
+        PrintS("\nto ");
+        wrp(h->p);
+        PrintLn();
+      }
       if ((*h).p == NULL)
       {
-        if (TEST_OPT_DEBUG) PrintS(" to 0\n");
         if (h->lcm!=NULL) pFree1((*h).lcm);
 #ifdef KDEBUG
@@ -450 +450 @@
         return;
       }
-#ifdef KDEBUG
-      else if (TEST_OPT_DEBUG)
-      {
-        PrintS("to:");
-        wrp((*h).p);
-        PrintLn();
-      }
-#endif
       /*- try to reduce the s-polynomial -*/
       pass++;
@@ -494 +486 @@
       if (j >= strat->sl)
       {
-        if (TEST_OPT_DEBUG) PrintLn();
         if (TEST_OPT_INTSTRATEGY)
         {
@@ -526 +517 @@
   pass = j = 0;
   d = reddeg = pFDeg((*h).p)+(*h).ecart;
-  if (TEST_OPT_DEBUG)
-  {
-    PrintS("red:");
-    wrp((*h).p);
-  }
   loop
   {
     if (pDivisibleBy1(strat->T[j].p,(*h).p))
     {
-      if (TEST_OPT_DEBUG) Print(" T[%d]",j);
       pi = strat->T[j].p;
       ei = strat->T[j].ecart;
@@ -553 +538 @@
         if ((strat->T[i].ecart < ei) && pDivisibleBy1(strat->T[i].p,(*h).p))
         {
-          if (TEST_OPT_DEBUG) Print(" T[%d]",i);
           /*
           * the polynomial to reduce with is now;
@@ -594 +578 @@
       if (TEST_OPT_DEBUG)
       {
-        PrintS("\nwith ");
+        PrintS("red:");
+        wrp(h->p);
+        PrintS(" with ");
         wrp(pi);
       }
@@ -607 +593 @@
       if (TEST_OPT_DEBUG)
       {
-        PrintS(" to ");
-        wrp((*h).p);
+        PrintS("\nto ");
+        wrp(h->p);
         PrintLn();
       }
@@ -681 +667 @@
       if (j >= strat->tl)
       {
-        if (TEST_OPT_DEBUG) PrintLn();
         if (TEST_OPT_INTSTRATEGY)
         {
@@ -863 +848 @@
   int z = 3;
 
- if (TEST_OPT_DEBUG)
- {
-   PrintS("red:");wrp(h);
- }
   if (0 > strat->sl)
   {
-    if (TEST_OPT_DEBUG) PrintLn();
     return h;
   }
@@ -880 +860 @@
       if (TEST_OPT_DEBUG)
       {
-        Print("\nwith S[%d]:",j);wrp(strat->S[j]);
+        PrintS("red:");
+        wrp(h);
+        PrintS(" with ");
+        wrp(strat->S[j]);
       }
       h = spSpolyRed(strat->S[j],h,strat->kNoether, strat->spSpolyLoop);
@@ -887 +870 @@
         PrintS("\nto:");
         wrp(h);
-        if (h==NULL) PrintLn();
       }
       if (h == NULL) return NULL;
@@ -1144 +1126 @@
                     strat->P.p = redtailBba(strat->P.p,pos-1,strat);
                     //if (strat->redTailChange)
-                      pCleardenom(strat->P.p);
+                      pCleardenom(strat->P.p);
                   }
                 }
@@ -1393 +1375 @@
                   strat->P.p = redtailBba(strat->P.p,pos-1,strat);
                   //if (strat->redTailChange)
-                    pCleardenom(strat->P.p);
+                    pCleardenom(strat->P.p);
                 }
               }

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.32 1999-04-29 11:38:48 Singular Exp $ */
+/* $Id: kutil.cc,v 1.33 1999-04-29 16:57:16 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -2750 +2750 @@
         pTest(h.p);
 #endif
-#ifdef KDEBUG
+#ifdef SDRING
         if (TEST_OPT_DEBUG && pSDRING)
         {
@@ -2920 +2920 @@
         {
           h.p=redBba(h.p,strat->sl,strat);
-          if (h.p!=NULL)
+          if (h.p!=NULL)
             h.p=redtailBba(h.p,strat->sl,strat);
         }
@@ -3094 +3094 @@
       {
         h1 = spSpolyRedNew(strat->S[j],h,strat->kNoether, strat->spSpolyLoop);
+        if(TEST_OPT_DEBUG)
+        {
+          PrintS("reduce "); wrp(h); Print(" with S[%d] (",j);wrp(strat->S[j]);
+          PrintS(")\nto "); wrp(h1); PrintLn();
+        }
         pDelete(&h);
         if (h1 == NULL) return NULL;
@@ -3147 +3152 @@
         && ((strat->fromQ==NULL) || (strat->fromQ[i]==0)))
         {
-          if (TEST_OPT_DEBUG)
-          {
-            PrintS("reduce:");
-            wrp(strat->S[i]);
-          }
           pDelete(&redSi);
           redSi = pHead(strat->S[i]);
@@ -3157 +3157 @@
           if ((strat->ak!=0)&&(strat->S[i]!=NULL))
             strat->S[i]=redQ(strat->S[i],i+1,strat); /*reduce S[i] mod Q*/
+          if (TEST_OPT_DEBUG && (pComp(redSi,strat->S[i])!=0))
+          {
+            PrintS("reduce:");
+            wrp(redSi);PrintS(" to ");wrp(strat->S[i]);PrintLn();
+          }
           if (TEST_OPT_PROT && (pComp(redSi,strat->S[i])!=0))
           {
@@ -3168 +3173 @@
           {
             pDelete(&redSi);
-            if (TEST_OPT_DEBUG) PrintS(" to 0");
             deleteInS(i,strat);
             i--;
@@ -3233 +3237 @@
               pNorm(strat->S[i]);
             }
-            if (TEST_OPT_DEBUG)
-            {
-              PrintS(" to ");
-              wrp(strat->S[i]);
-            }
           }
-          if (TEST_OPT_DEBUG) PrintLn();
         }
         i++;
@@ -3709 +3707 @@
          /*Shdl=*/initS(F, Q,strat); /*sets also S, ecartS, fromQ */
     else
-    #endif      
+    #endif
     /*Shdl=*/initSL(F, Q,strat); /*sets also S, ecartS, fromQ */
     // /*Shdl=*/initS(F, Q,strat); /*sets also S, ecartS, fromQ */

Singular/misc.cc

@@ -578 +578 @@
 
         if (TEST_OPT_INTSTRATEGY && (currRing!=NULL)
-        && rField_has_simple_inverse())
+        && rField_has_simple_inverse())
         {
           test &=~Sy_bit(OPT_INTSTRATEGY);
@@ -602 +602 @@
           Warn("cannot set option");
         if (TEST_OPT_INTSTRATEGY && (currRing!=NULL)
-        && rField_has_simple_inverse())
+        && rField_has_simple_inverse())
         {
           test &=~Sy_bit(OPT_INTSTRATEGY);

Singular/sdb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sdb.cc,v 1.2 1999-04-20 17:02:48 Singular Exp $ */
+/* $Id: sdb.cc,v 1.3 1999-04-29 16:57:18 Singular Exp $ */
 /*
 * ABSTRACT: Singular debugger
@@ -15 +15 @@
 #include "sdb.h"
 
-int sdb_lines[6]={-1,-1,-1,-1,-1,-1,-1};
+int sdb_lines[]={-1,-1,-1,-1,-1,-1,-1,-1};
 
 int sdb_checkline(char f)
@@ -33 +33 @@
 static char sdb_lastcmd='c';
 
-void sdb(Voice * currentVoice, char * currLine, int len)
+void sdb(Voice * currentVoice, char * currLine, int len, char *b)
 {
   int bp=0;
@@ -66 +66 @@
       {
         case 'd':
+        {
+          fprintf(stdout,"delete break point %d\n",bp);
           currentVoice->pi->trace_flag &= (~Sy_bit(bp));
+          if (bp!=0)
+          {
+            sdb_lines[bp-1]=-1;
+          }
+          int f=currentVoice->pi->trace_flag;
+          fprintf(stdout,"active breakpoints: \n");
+          int i;
+          for(i=1;i<=7;i++)
+          {
+            f=f>>1;
+            if (f&1)
+              fprintf(stdout,"%d:line %d", i,  sdb_lines[i-1]);
+          }
+          fprintf(stdout,"\n");
           break;
+        }
         case 'n':
           currentVoice->pi->trace_flag|= 1;
           return;
-//        case 'e':
-//        {
+        case 'e':
+        {
+          int i=strlen(b);
+          while ((i>=0) && (b[i]<=' ')) i--;
+          if (i<0)
+          {
+            fprintf(stdout,"cannot set ~ at empty line\n");
+            break;
+          }
+          if (b[i]!=';')
+          {
+            fprintf(stdout,"cannot set ~ at char `%c`\n",b[i]);
+            break;
+          }
+          b[i+1]='~';
+          b[i+2]=';';
+          b[i+3]='\n';
+          b[i+4]='\0';
+          return;
+        }
 //          sdb_lastcmd='c';
 //          if (*(p+1)!=' ')

Singular/sdb.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sdb.h,v 1.2 1999-04-20 17:02:49 Singular Exp $ */
+/* $Id: sdb.h,v 1.3 1999-04-29 16:57:18 Singular Exp $ */
 /*
 * ABSTRACT: Singular debugger
@@ -13 +13 @@
 extern int sdb_lines[];
 
-void sdb(Voice * currentVoice, char * currLine, int len);
+void sdb(Voice * currentVoice, char * currLine, int len, char * buffer);
 #endif