Changeset d14712 in git

Timestamp:

Sep 29, 1999, 12:59:43 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

4f011a3b4ee2de9e079fb1b3ff36483e9f1f0511

Parents:

c88c949ab8d0ed79f5fe01cd33e526815d5e041f

Message:

* got rid off STDTRACE, FAST_AND_DIRTY, (most) DRING, SRING, SDRING
* got rid of spoly*.* stuff


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

Location:

Singular

Files:

• Makefile.in (modified) (12 diffs)
• attrib.cc (modified) (3 diffs)
• extra.cc (modified) (5 diffs)
• fglmcomb.cc (modified) (2 diffs)
• kbuckets.cc (modified) (14 diffs)
• kbuckets.h (modified) (1 diff)
• kspoly.cc (added)
• kstd1.cc (modified) (35 diffs)
• kstd1.h (modified) (2 diffs)
• kstd2.cc (modified) (17 diffs)
• kstdfac.cc (modified) (6 diffs)
• kutil.cc (modified) (41 diffs)
• kutil.h (modified) (4 diffs)
• mmheap.h (modified) (3 diffs)
• mod2.h.in (modified) (4 diffs)
• mpsr_Error.cc (modified) (2 diffs)
• numbers.cc (modified) (2 diffs)
• numbers.h (modified) (2 diffs)
• pProcs.cc (added)
• pProcs.h (added)
• polys-comp.h (modified) (2 diffs)
• polys-impl.h (modified) (6 diffs)
• polys.cc (modified) (8 diffs)
• polys.h (modified) (5 diffs)
• polys0.cc (modified) (4 diffs)
• polys1.cc (modified) (3 diffs)
• ring.cc (modified) (8 diffs)
• ring.h (modified) (3 diffs)
• spSpolyLoop.inc (modified) (1 diff)
• spolys.h (modified) (1 diff)
• structs.h (modified) (2 diffs)
• syz.cc (modified) (2 diffs)
• syz.h (modified) (2 diffs)
• syz0.cc (modified) (16 diffs)
• syz1.cc (modified) (10 diffs)
• syz2.cc (modified) (3 diffs)
• tesths.cc (modified) (2 diffs)

Singular/Makefile.in

@@ -74 +74 @@
     ipassign.cc ipconv.cc ipid.cc iplib.cc \
     ipprint.cc ipshell.cc khstd.cc kstdfac.cc \
-    comm.cc kstd1.cc kstd2.cc kutil.cc lists.cc \
+    kstd1.cc kstd2.cc kutil.cc lists.cc \
     longalg.cc longrat.cc longrat0.cc \
     maps.cc matpol.cc misc.cc sdb.cc gnumpfl.cc gnumpc.cc \
@@ -81 +81 @@
     numbers.cc polys.cc polys0.cc polys1.cc polys-impl.cc \
     ring.cc shortfl.cc silink.cc sing_mp.cc\
-    sing_dld.cc sing_dbm.cc spolys.cc spolys0.cc \
+    sing_dld.cc sing_dbm.cc kspoly.cc \
     subexpr.cc syz.cc syz0.cc syz1.cc \
     timer.cc weight.cc \
@@ -87 +87 @@
     mpsr_Get.cc mpsr_GetMisc.cc mpsr_Error.cc \
     GMPrat.cc multicnt.cc npolygon.cc semic.cc spectrum.cc splist.cc \
-    ndbm.cc spSpolyLoop.cc libparse.cc mod_raw.cc\
-    pcv.cc kbuckets.cc kbPolyProcs.cc \
+    ndbm.cc  libparse.cc mod_raw.cc\
+    pcv.cc kbuckets.cc pProcs.cc \
     mpr_inout.cc mpr_base.cc mpr_numeric.cc
 # normal C source files
@@ -97 +97 @@
 ESOURCES=iparith.cc gmalloc.c tesths.cc mpsr_Tok.cc claptmpl.cc
 
-SOURCES=${CSOURCES} ${CXXSOURCES} grammar.y scanner.l libparse.l spSpolyLoop.pl generate.pl
+SOURCES=${CSOURCES} ${CXXSOURCES} grammar.y scanner.l libparse.l 
 
 SOURCES=${CSOURCES} ${CXXSOURCES} ${ESOURCES} \
-        grammar.y scanner.l libparse.l spSpolyLoop.pl generate.pl
+        grammar.y scanner.l libparse.l 
 
 HEADERS=algmap.h hutil.h lists.h stairc.h attrib.h ideals.h \
@@ -110 +110 @@
         mmemory.h mmprivate.h mmheap.h mmpage.h page.h \
         ffields.h khstd.h silink.h sparsmat.h gnumpfl.h gnumpc.h \
-        fglm.h comm.h kstd1.h modulop.h sing_dbm.h weight.h \
-        fglmgauss.h fglmvec.h kstd2.h mpsr.h sing_mp.h \
-        kstdfac.h mpsr_Get.h spolys.h \
-        kutil.h mpsr_Put.h spolys0.h sing_dld.h\
-        ndbm.h spSpolyLoop.h polys-impl.h polys-comp.h libparse.h \
+        fglm.h kstd1.h modulop.h sing_dbm.h weight.h \
+        fglmgauss.h fglmvec.h mpsr.h sing_mp.h \
+        kstdfac.h mpsr_Get.h \
+        kutil.h mpsr_Put.h sing_dld.h\
+        ndbm.h polys-impl.h polys-comp.h libparse.h \
         GMPrat.h multicnt.h npolygon.h semic.h spectrum.h splist.h multicnt.h \
-        pcv.h mod_raw.h kbuckets.h kbPolyProcs.h \
+        pcv.h mod_raw.h kbuckets.h pProcs.h \
         mpr_global.h mpr_inout.h mpr_base.h mpr_numeric.h \
         feOpt.h fegetopt.h
 
-INCS=febase.inc polys.inc iparith.inc mpsr_Tok.inc spSpolyLoop.inc feOpt.inc
+INCS=febase.inc polys.inc iparith.inc mpsr_Tok.inc feOpt.inc
 
 TESTS=${testdir}/comparecheck ${testdir}/fac_test.in ${testdir}/fac_test.out\
@@ -211 +211 @@
         echo unsigned long feVersionId =  `date '+%Y%m%d%H'`\; >version.h
 
-kbPolyProcs.cc kbPolyProcs.dd : kbPolyProcs.pin
-
-kbPolyProcs.pin : generate.pl
-        @if test "x${PERL5}" = x; then \
-                echo Error: no perl5 given. Can not rebuild $@;\
-                exit 1;\
-        fi
-        ${PERL5} generate.pl kb_n_Mult_p kb_p_Mult_m kb_p_Add_q kb_p_Minus_m_Mult_q > $@
-
-spSpolyLoop.cc spSpolyLoop.dd : spSpolyLoop.inc
-
-spSpolyLoop.inc: spSpolyLoop.pl
-        @if test "x${PERL5}" = x; then \
-                echo Error: no perl5 given. Can not rebuild spSpolyLoop.inc;\
-                exit 1;\
-        fi
-        ${PERL5} spSpolyLoop.pl > spSpolyLoop.inc
-
-
 libparse: libparse_main.o utils.o fegetopt.o
         ${CXX} -o libparse libparse_main.o utils.o fegetopt.o
@@ -259 +240 @@
         rm a.out
 
-src: scanner.cc grammar.h grammar.cc libparse.cc spSpolyLoop.inc
+src: scanner.cc grammar.h grammar.cc libparse.cc 
 
 mod2.h: stamp-h
@@ -322 +303 @@
         @echo "Rebuilding the deleted files requires flex"
         @echo "bison, perl"
-        -rm -f scanner.cc grammar.h grammar.cc libparse.cc spSpolyLoop.inc
+        -rm -f scanner.cc grammar.h grammar.cc libparse.cc
 
 maintainer-clean: distclean srcclean
@@ -450 +431 @@
      gnumpc.op longrat.op longrat0.op misc.op ring.op numbers.op maps.op\
      hilb.op comm.op kstd1.op kstd2.op kutil.op khstd.op kstdfac.op modulop.op \
-     spolys.op ideals.op subexpr.op hdegree.op hutil.op ffields.op shortfl.op \
-     longalg.op spolys0.op syz.op syz0.op syz1.op weight.op \
+     ideals.op subexpr.op hdegree.op hutil.op ffields.op shortfl.op \
+     longalg.op kspoly.op syz.op syz0.op syz1.op weight.op \
      ipid.op ipshell.op iplib.op ipassign.op ipconv.op ipprint.op\
      polys.op polys0.op polys1.op polys-impl.op extra.op\
@@ -460 +441 @@
      mpsr_Error.op mpsr_Put.op mpsr_PutPoly.op mpsr_GetPoly.op \
      mpsr_Get.op mpsr_GetMisc.op \
-     ndbm.op spSpolyLoop.op libparse.op  mod_raw.op \
+     ndbm.op libparse.op  mod_raw.op \
      mpr_inout.op mpr_base.op mpr_numeric.op \
      GMPrat.op multicnt.op npolygon.op semic.op spectrum.op splist.op \
@@ -479 +460 @@
      hilb.ob comm.ob kstd1.ob kstd2.ob kutil.ob khstd.ob kstdfac.ob modulop.ob \
      spolys.ob ideals.ob subexpr.ob hdegree.ob hutil.ob ffields.ob shortfl.ob \
-     longalg.ob spolys0.ob syz.ob syz0.ob syz1.ob weight.ob \
+     longalg.ob kspoly.ob syz.ob syz0.ob syz1.ob weight.ob \
      ipid.ob ipshell.ob iplib.ob ipassign.ob ipconv.ob ipprint.ob\
      polys.ob polys0.ob polys1.ob polys-impl.ob extra.ob\
@@ -488 +469 @@
      mpsr_Error.ob mpsr_Put.ob mpsr_PutPoly.ob mpsr_GetPoly.ob \
      mpsr_Get.ob mpsr_GetMisc.ob \
-     ndbm.ob spSpolyLoop.ob libparse.ob mod-${SINGUNAME}.ob \
+     ndbm.ob libparse.ob mod-${SINGUNAME}.ob \
      pcv.ob kbuckets.ob kbPolyProcs.ob
 

Singular/attrib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: attrib.cc,v 1.14 1999-09-17 11:42:22 Singular Exp $ */
+/* $Id: attrib.cc,v 1.15 1999-09-29 10:59:27 obachman Exp $ */
 
 /*
@@ -350 +350 @@
     I->rank=max(I->rank,(int)c->Data());
   }
-#ifdef DRING
-  else if (strcmp(name,"D")==0)
-  {
-    if (c->Typ()!=INT_CMD)
-    {
-      WerrorS("attrib `D` must be int");
-      return TRUE;
-    }
-    switch (v->Typ())
-    {
-      case POLY_CMD:
-      case VECTOR_CMD:
-        pdSetDFlagP((poly)v->Data(),(int)c->Data());
-        break;
-      case IDEAL_CMD:
-      case MODUL_CMD:
-        {
-          ideal I=(ideal)v->Data();
-          int i=IDELEMS(I)-1;
-          int cc=(int)c->Data();
-          while (i>=0) { pdSetDFlagP(I->m[i],cc); i--; }
-          break;
-        }
-      default:
-        WerrorS("cannot set attrib `D` for this type");
-    }
-  }
-#endif
   else
   {
@@ -418 +390 @@
     resetFlag((idhdl)a->data,FLAG_STD);
   }
-#ifdef DRING
-  else if (strcmp(name,"D")==0)
-  {
-    resetFlag(a,FLAG_DOPERATOR);
-    resetFlag((idhdl)a->data,FLAG_DOPERATOR);
-  }
-#endif
   else
   {

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.107 1999-09-27 15:32:54 obachman Exp $ */
+/* $Id: extra.cc,v 1.108 1999-09-29 10:59:28 obachman Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -57 +57 @@
 #endif
 
-#ifdef STDTRACE
-//#include "comm.h"
-#endif
-
 #ifdef HAVE_FACTORY
 #define SI_DONT_HAVE_GLOBAL_VARS
@@ -192 +188 @@
         char *s=(char *)h->Data();
         res->rtyp=INT_CMD;
-        #ifdef DRING
-          TEST_FOR("DRING")
-        #endif
         #ifdef HAVE_DBM
           TEST_FOR("DBM")
@@ -216 +209 @@
           TEST_FOR("tcl")
         #endif
-        #ifdef SRING
-          TEST_FOR("SRING")
-        #endif
         #ifdef TEST_MAC_ORDER
           TEST_FOR("MAC_ORDER");
@@ -705 +695 @@
     }
     else
-    /*==================== trace =============================*/
-#ifdef STDTRACE
-    /* Parameter : Ideal, Liste mit Links. */
-    if(strcmp(sys_cmd,"stdtrace")==0)
-    {
-      if ((h!=NULL) &&(h->Typ()==IDEAL_CMD))
-      {
-        leftv root  = NULL,
-              ptr   = NULL,
-              lv    = NULL;
-        lists l     = NULL;
-        ideal I     = (ideal)(h->Data());
-        lists links = (lists)(h->next->Data());
-        tHomog hom  = testHomog;
-        int rw      = (int)(h->next->next->Data());
-
-        if(I==NULL)
-          PrintS("I==NULL\n");
-        for(int i=0; i <= links->nr ; i++)
-        {
-          lv = (leftv)Alloc0(sizeof(sleftv));
-          lv->Copy(&(links->m[i]));
-          if(root==NULL)
-          root=lv;
-          if(ptr==NULL)
-          {
-            ptr=lv;
-            ptr->next=NULL;
-          }
-          else
-          {
-            ptr->next=lv;
-            ptr=lv;
-          }
-        }
-        ptr->next=NULL;
-        l=TraceStd(root,rw,I,currQuotient,testHomog,NULL);
-        idSkipZeroes(((ideal)l->m[0].Data()));
-        res->rtyp=LIST_CMD;
-        res->data=(void *) l;
-        res->next=NULL;
-        root->CleanUp();
-        Free(root,sizeof(sleftv));
-        return FALSE;
-      }
-      else
-         WerrorS("ideal expected");
-    }
-    else
-#endif
 #ifdef HAVE_FACTORY
 /*==================== fastcomb =============================*/

Singular/fglmcomb.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmcomb.cc,v 1.14 1998-10-28 12:43:29 Singular Exp $
+// $Id: fglmcomb.cc,v 1.15 1999-09-29 10:59:28 obachman Exp $
 
 /****************************************
@@ -21 +21 @@
 #include "ideals.h"
 #include "ring.h"
-#include "spolys.h"
 #include "ipid.h"
 #include "ipshell.h"

Singular/kbuckets.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.cc,v 1.4 1999-09-27 14:57:12 obachman Exp $ */
+/* $Id: kbuckets.cc,v 1.5 1999-09-29 10:59:29 obachman Exp $ */
 
 #include "mod2.h"
@@ -10 +10 @@
 #include "polys.h"
 #include "febase.h"
-#include "spolys0.h"
+#include "pProcs.h"
 #include "kbuckets.h"
 #include "numbers.h"
@@ -290 +290 @@
   for (i=2; i<=bucket->buckets_used; i++)
   {
-    kb_p_Add_q(&p, &pl,
-               &(bucket->buckets[i]),&(bucket->buckets_length[i]),
-               bucket->heap);
+    p = p_Add_q(p, bucket->buckets[i], 
+                &pl, bucket->buckets_length[i],
+                bucket->heap);
   }
 
@@ -418 +418 @@
   for (i=0; i<= bucket->buckets_used; i++)
     if (bucket->buckets[i] != NULL)
-      kb_n_Mult_p(n, bucket->buckets[i]);
+      bucket->buckets[i] = p_Mult_n(bucket->buckets[i], n);
 #else
-  kb_n_Mult_p(n, bucket->p);
+  bucket->p = p_Mult_n(bucket->p, n);
 #endif
 }
@@ -452 +452 @@
   if (i <= bucket->buckets_used && bucket->buckets[i] != NULL)
   {
-    kb_p_Minus_m_Mult_q
-      (&(bucket->buckets[i]), &(bucket->buckets_length[i]),
-       m,
-       p1, l1,
-       spNoether,
-       bucket->heap);
-    p1 = bucket->buckets[i];
+    p1 = p_Minus_m_Mult_q(bucket->buckets[i], m, p1,
+                         spNoether,
+                         &(bucket->buckets_length[i]), l1,
+                         bucket->heap);
     l1 = bucket->buckets_length[i];
     bucket->buckets[i] = NULL;
@@ -465 +462 @@
     while (bucket->buckets[i] != NULL)
     {
-      kb_p_Add_q(&p1, &l1,
-                 &(bucket->buckets[i]),
-                 &(bucket->buckets_length[i]),
-                 bucket->heap);
+      p1 = p_Add_q(p1, bucket->buckets[i], 
+                   &l1, bucket->buckets_length[i],
+                   bucket->heap);
       i = pLogLength(l1);
     }
@@ -475 +471 @@
   {
     pSetCoeff0(m, nNeg(pGetCoeff(m)));
-    kb_p_Mult_m(p1, m, spNoether, bucket->heap);
+    p1 = p_Mult_m(p1, m, spNoether, bucket->heap);
     pSetCoeff0(m, nNeg(pGetCoeff(m)));
   }
@@ -486 +482 @@
     kBucketAdjustBucketsUsed(bucket);
 #else // HAVE_PSEUDO_BUCKETS
-  kb_p_Minus_m_Mult_q(&(bucket->p), &(bucket->l),
-                                   m, p, l1, spNoether,
-                                   bucket->heap);
+  bucket->p = p_Minus_m_Mult_q(bucket->p, m,  p, 
+                               &(bucket->l), l1, 
+                               spNoether, bucket->heap);
 #endif
   kbTests(bucket);
@@ -520 +516 @@
         bucket->buckets_length[i] -= lq;
         assume(pLength(bucket->buckets[i]) == bucket->buckets_length[i]);
-        kb_p_Add_q(&p, &lp, &q, &lq, bucket->heap);
+        p = p_Add_q(p, q, &lp, lq, bucket->heap);
       }
     }
@@ -552 +548 @@
       {
         bucket->buckets_length[i] -= lq;
-        kb_p_Add_q(&p, &lp, &q, &lq, bucket->heap);
+        p = p_Add_q(p, q, &lp, lq, bucket->heap);
       }
     }
@@ -570 +566 @@
 //
 
-extern int spCheckCoeff(number *a, number *b);
+extern int ksCheckCoeff(number *a, number *b);
 
 number kBucketPolyRed(kBucket_pt bucket,
@@ -593 +589 @@
   {
     number an = pGetCoeff(p1), bn = pGetCoeff(lm);
-    int ct = spCheckCoeff(&an, &bn);
+    int ct = ksCheckCoeff(&an, &bn);
     pSetCoeff(lm, bn);
     if ((ct == 0) || (ct == 2)) kBucket_Mult_n(bucket, an);
@@ -611 +607 @@
   }
 
-  spMonSub(lm,p1);
+  pMonSubFrom(lm,p1);
   l1--;
 
@@ -617 +613 @@
 
   kb_pDelete1(lm, bucket->heap);
-  if (reset_vec) spModuleToPoly(a1);
+  if (reset_vec) pSetCompP(a1, 0);
   kbTests(bucket);
   return rn;

Singular/kbuckets.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.h,v 1.4 1999-09-27 14:34:18 obachman Exp $ */
+/* $Id: kbuckets.h,v 1.5 1999-09-29 10:59:29 obachman Exp $ */
 #include "mod2.h"
 #include "mmheap.h"
-#include "kbPolyProcs.h"
 
 /////////////////////////////////////////////////////////////////////////

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.37 1999-09-13 08:16:20 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.38 1999-09-29 10:59:30 obachman Exp $ */
 /*
 * ABSTRACT:
@@ -14 +14 @@
 #include "kutil.h"
 #include "kstd1.h"
-#include "kstd2.h"
 #include "khstd.h"
-#include "spolys.h"
 #include "stairc.h"
 #include "weight.h"
@@ -26 +24 @@
 #include "timer.h"
 #include "lists.h"
-#ifdef STDTRACE
-#include "comm.h"
-#endif
-#include "spSpolyLoop.h"
 
 //#include "ipprint.h"
@@ -108 +102 @@
   if (intoT)
   {
-    hp = spSpolyRedNew(*with,(*h).p,strat->kNoether, strat->spSpolyLoop);
+    hp = ksOldSpolyRedNew(*with,(*h).p,strat->kNoether);
     enterT(*h,strat);
     (*h).p = hp;
@@ -114 +108 @@
   else
   {
-    (*h).p = spSpolyRed(*with,(*h).p,strat->kNoether, strat->spSpolyLoop);
+    (*h).p = ksOldSpolyRed(*with,(*h).p,strat->kNoether);
   }
   if (TEST_OPT_DEBUG)
@@ -216 +210 @@
         if (at <= strat->Ll)
         {
+          /*test if h is already standardbasis element*/
+#ifdef HAVE_HOMOG_T
+          i=strat->tl+1;
+#else
           i=strat->sl+1;
+#endif
           do
           {
             i--;
             if (i<0) return;
+#ifdef HAVE_HOMOG_T
+          } while (!pDivisibleBy1(strat->T[i].p,(*h).p));
+#else
           } while (!pDivisibleBy1(strat->S[i],(*h).p));
+#endif        
           enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
           if (TEST_OPT_DEBUG) Print(" degree jumped; ->L%d\n",at);
@@ -367 +370 @@
         if (at <= strat->Ll)
         {
+#ifdef HAVE_HOMOG_T
+          i=strat->tl+1;
+#else
           i=strat->sl+1;
+#endif
           do
           {
             i--;
             if (i<0) return;
+#ifdef HAVE_HOMOG_T
+          } while (!pDivisibleBy1(strat->T[i].p,(*h).p));
+#else
           } while (!pDivisibleBy1(strat->S[i],(*h).p));
+#endif        
           enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
           if (TEST_OPT_DEBUG) Print(" degree jumped; ->L%d\n",at);
@@ -429 +440 @@
         wrp(strat->T[j].p);
       }
-      (*h).p = spSpolyRed(strat->T[j].p,(*h).p,strat->kNoether,
-                          strat->spSpolyLoop);
+      (*h).p = ksOldSpolyRed(strat->T[j].p,(*h).p,strat->kNoether);
       if (TEST_OPT_DEBUG)
       {
@@ -468 +478 @@
         if (at <= strat->Ll)
         {
+#ifdef HAVE_HOMOG_T
+          i=strat->tl+1;
+#else
           i=strat->sl+1;
+#endif
           do
           {
             i--;
             if (i<0) return;
+#ifdef HAVE_HOMOG_T
+          } while (!pDivisibleBy1(strat->T[i].p,(*h).p));
+#else
           } while (!pDivisibleBy1(strat->S[i],(*h).p));
+#endif        
           enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
           if (TEST_OPT_DEBUG) Print(" degree jumped; ->L%d\n",at);
@@ -617 +635 @@
         if (at <= strat->Ll)
         {
+#ifdef HAVE_HOMOG_T
+          i=strat->tl+1;
+#else
           i=strat->sl+1;
+#endif
           do
           {
             i--;
             if (i<0) return;
+#ifdef HAVE_HOMOG_T
+          } while (!pDivisibleBy1(strat->T[i].p,(*h).p));
+#else
           } while (!pDivisibleBy1(strat->S[i],(*h).p));
+#endif        
           enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
           if (TEST_OPT_DEBUG) Print(" degree jumped; ->L%d\n",at);
@@ -910 +936 @@
       {
         pFree1(strat->L[j].p);    /*deletes the short spoly and computes*/
-        strat->L[j].p=spSpolyCreate(strat->L[j].p1,
+        strat->L[j].p=ksOldCreateSpoly(strat->L[j].p1,
                                     strat->L[j].p2,
-                                    strat->kNoether,
-                                    strat->spSpolyLoop);   /*the real one*/
+                                    strat->kNoether);   /*the real one*/
         if (!strat->honey)
           strat->initEcart(&strat->L[j]);
@@ -951 +976 @@
       {
         pFree1(strat->L[i].p);
-        strat->L[i].p = spSpolyCreate(strat->L[i].p1,
-                                      strat->L[i].p2,
-                                      strat->kNoether,
-                                      strat->spSpolyLoop);
+        strat->L[i].p = ksOldCreateSpoly(strat->L[i].p1,
+                                         strat->L[i].p2,
+                                         strat->kNoether);
+        
+                                      
         strat->L[i].ecart = pLDeg(strat->L[i].p,&strat->L[i].length)-pFDeg(strat->L[i].p);
       }
@@ -1041 +1067 @@
   int i;
 
-#ifdef SDRING
-  if (pSDRING
-  && (atS<=strat->sl)
-  && pComparePolys(p.p,strat->S[atS]))
-  {
-    if (TEST_OPT_PROT)
-      PrintS("m");
-    p.p=NULL;
-    return;
-  }
-  if (pSDRING
-  && (atS<strat->sl)
-  && pComparePolys(p.p,strat->S[atS+1]))
-  {
-    if (TEST_OPT_PROT)
-      PrintS("m");
-    p.p=NULL;
-    return;
-  }
-  if (pSDRING
-  && (atS>0)
-  && pComparePolys(p.p,strat->S[atS-1]))
-  {
-    if (TEST_OPT_PROT)
-      PrintS("m");
-    p.p=NULL;
-    return;
-  }
-#endif
   strat->news = TRUE;
   /*- puts p to the standardbasis s at position atS -*/
@@ -1248 +1245 @@
   int hilbeledeg=1,hilbcount=0;
 
-#ifdef SDRING
-  polyset aug=(polyset)Alloc(setmax*sizeof(poly));
-  int augmax=setmax, augl=-1;
-  poly oldLcm;
-#endif
-
   strat->update = TRUE;
   /*- setting global variables ------------------- -*/
@@ -1315 +1306 @@
     {
       pFree1(strat->P.p);/*- deletes the short spoly and computes -*/
-      strat->P.p = spSpolyCreate(strat->P.p1,
-                                 strat->P.p2,
-                                 strat->kNoether,
-                                 strat->spSpolyLoop);/*- the real one -*/
+      strat->P.p = ksOldCreateSpoly(strat->P.p1,
+                                    strat->P.p2,
+                                    strat->kNoether);/*- the real one -*/
       if (!strat->honey)
         strat->initEcart(&strat->P);
@@ -1324 +1314 @@
         strat->P.length = pLength(strat->P.p);
     }
-#ifdef SDRING
-    if (strat->P.p != NULL)
-#endif
     {
       if (TEST_OPT_PROT) message(strat->P.ecart+pFDeg(strat->P.p),&olddeg,&reduc,strat);
@@ -1333 +1320 @@
     if (strat->P.p != NULL)
     {
-#ifdef SDRING
-      aug[0]=strat->P.p;
-      augl=0;
-      if (pSDRING)
-      {
-        oldLcm=strat->P.lcm;
-#ifdef SRING
-        if (pSRING) psAug(pCopy(strat->P.p),pOne(),&aug,&augl,&augmax);
-#endif
-#ifdef DRING
-        if (pDRING) pdAug(pCopy(strat->P.p),&aug,&augl,&augmax);
-#endif
-      }
-      for (augl++;augl != 0;)
-      {
-        strat->P.p=aug[--augl];
-        if (pSDRING)
-        {
-          if (oldLcm==NULL) strat->P.lcm=NULL;
-          else  strat->P.lcm=pCopy1(oldLcm);
-        }
-        if ((augl!=0) && (strat->P.p!=NULL)) strat->red(&strat->P,strat);
-        if (strat->P.p != NULL)
-        {
-#endif
           if (TEST_OPT_PROT) PrintS("s");/*- statistic -*/
           /*- enter P.p into s and b: -*/
@@ -1378 +1340 @@
           {
             int pos;
-#ifdef SDRING
-            pos = posInS(strat->S,strat->sl,strat->P.p);
-            if (pSDRING && (pos<=strat->sl)
-            && (pComparePolys(strat->P.p,strat->S[pos])))
-            {
-              if (TEST_OPT_PROT)
-                PrintS("d");
-            }
-            else
-#endif
             {
               enterpairs(strat->P.p,strat->sl,strat->P.ecart,0,strat);
@@ -1404 +1356 @@
           if (strat->P.lcm!=NULL) pFree1(strat->P.lcm);
           strat->P.lcm=NULL;
-#ifdef SDRING
-        }
-      }
-      /* delete the old pair */
-      if (pSDRING &&(oldLcm!=NULL)) pFree1(oldLcm);
-#endif
 #ifdef KDEBUG
       memset(&strat->P,0,sizeof(strat->P));
@@ -1450 +1396 @@
   pDelete(&strat->kNoether);
   Free((ADDRESS)strat->NotUsedAxis,(pVariables+1)*sizeof(BOOLEAN));
-#ifdef SDRING
-  Free((ADDRESS)aug,augmax*sizeof(poly));
-#endif
   if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
   if (TEST_OPT_WEIGHTM)
@@ -1499 +1442 @@
   initBuchMoraPos(strat);
   initMora(F,strat);
-  strat->spSpolyLoop = spGetSpolyLoop(currRing,
-                                      max(strat->ak,pMaxComp(q)),
-                                      strat->syzComp, FALSE);
   strat->enterS = enterSMoraNF;
   /*- set T -*/
@@ -1597 +1537 @@
   strat->enterS = enterSMoraNF;
   /*- set T -*/
-  strat->spSpolyLoop = spGetSpolyLoop(currRing,
-                                      max(strat->ak,idRankFreeModule(q)),
-                                      strat->syzComp, FALSE);
   strat->tl = -1;
   strat->tmax = setmax;
@@ -1723 +1660 @@
   }
   if ((h==testHomog)
-#ifdef DRING
-  && (!pDRING)
-#endif
   )
   {
@@ -1746 +1680 @@
   }
   pLexOrder=b;
-#ifdef DRING
-  if (pDRING) h=isNotHomog;
-#endif
   if (h==isHomog)
   {
@@ -1765 +1696 @@
   }
   strat->homog=h;
-  spSet(currRing);
-  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat, syzComp);
   if (pOrdSgn==-1)
   {
@@ -1776 +1705 @@
   else
   {
-    #ifdef STDTRACE
-    lists l;
-    if (w!=NULL)
-      l=bbaLink(F,Q,*w,hilb,strat);
-    else
-      l=bbaLink(F,Q,NULL,hilb,strat);
-    r=(ideal)(l->m[0].data);
-    l->m[0].data=NULL;
-    l->Clean();
-    #else
     if (w!=NULL)
       r=bba(F,Q,*w,hilb,strat);
     else
       r=bba(F,Q,NULL,hilb,strat);
-    #endif
   }
 #ifdef KDEBUG
@@ -1813 +1731 @@
 //##############################################################
 //##############################################################
-
-#ifdef STDTRACE
-lists TraceStd(leftv lv,int rw, ideal F, ideal Q, tHomog h,intvec ** w, intvec *hilb,int syzComp,
-          int newIdeal)
-{
-  lists l;
-  ideal r;
-  stdLink stdTrace=(stdLink) Alloc0(sizeof(skstdLink));
-  BOOLEAN b=pLexOrder,toReset=FALSE;
-  BOOLEAN delete_w=(w==NULL);
-  kStrategy strat=(kStrategy)Alloc0(sizeof(skStrategy));
-
-  if(!TEST_OPT_RETURN_SB)
-    strat->syzComp = syzComp;
-  if (TEST_OPT_SB_1)
-    strat->newIdeal = newIdeal;
-  strat->LazyPass=32000;
-  strat->LazyDegree = 10;
-  strat->ak = idRankFreeModule(F);
-//   if(stdTrace!=NULL)
-//     stdTrace->GetPrimes(F,primes);  // Array mit Primzahlen muß geordnet sein !
-
-  if ((h==testHomog)
-#ifdef DRING
-  && (!pDRING)
-#endif
-  )
-  {
-    if (strat->ak == 0)
-    {
-      h = (tHomog)idHomIdeal(F,Q);
-      w=NULL;
-    }
-    else
-      h = (tHomog)idHomModule(F,Q,w);
-  }
-#ifdef DRING
-  if (pDRING) h=isNotHomog;
-#endif
-  if (h==isHomog)
-  {
-    if ((w!=NULL) && (*w!=NULL))
-    {
-      kModW = *w;
-      strat->kModW = *w;
-      pOldFDeg = pFDeg;
-      pFDeg = kModDeg;
-      toReset = TRUE;
-    }
-    pLexOrder = TRUE;
-    if (hilb==NULL) strat->LazyPass*=2;
-  }
-  strat->homog=h;
-  spSet(currRing);
-  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat syzComp);
-//   if (pOrdSgn==-1)
-//   {
-//     if (w!=NULL)
-//       r=mora(F,Q,*w,hilb,strat);
-//     else
-//       r=mora(F,Q,NULL,hilb,strat);
-//   }
-//   else
-  {
-    stdTrace->Init(lv,rw);
-    if(w==NULL)
-      l=bbaLink(F,Q,NULL,hilb,strat,stdTrace);
-    else
-      l=bbaLink(F,Q,*w,hilb,strat,stdTrace);
-    r=(ideal) (l->m[0].Data());
-  }
-#ifdef KDEBUG
-  int i;
-  for (i=0; i<IDELEMS(r); i++) pTest(r->m[i]);
-#endif
-  if (toReset)
-  {
-    kModW = NULL;
-    pFDeg = pOldFDeg;
-  }
-  pLexOrder = b;
-//Print("%d reductions canceled \n",strat->cel);
-  HCord=strat->HCord;
-  Free((ADDRESS)strat,sizeof(skStrategy));
-  if ((delete_w)&&(w!=NULL)&&(*w!=NULL)) delete *w;
-  if(stdTrace!=NULL)
-  {
-    stdTrace->Kill();
-    Free(stdTrace, sizeof(skstdLink));
-  }
-
-  return l;
-}
-#endif
 
 lists min_std(ideal F, ideal Q, tHomog h,intvec ** w, intvec *hilb,int syzComp,
@@ -1928 +1752 @@
   strat->ak = idRankFreeModule(F);
   if ((h==testHomog)
-#ifdef DRING
-  && (!pDRING)
-#endif
   )
   {
@@ -1943 +1764 @@
     }
   }
-#ifdef DRING
-  if (pDRING) h=isNotHomog;
-#endif
   if (h==isHomog)
   {
@@ -1970 +1788 @@
   }
   strat->homog=h;
-  spSet(currRing);
-  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat, syzComp);
   if (pOrdSgn==-1)
   {
@@ -1981 +1797 @@
   else
   {
-  #ifdef STDTRACE
-    lists rl;
-    if (w!=NULL)
-      rl=bbaLink(F, Q, *w, hilb, strat, NULL);
-    else
-      rl=bbaLink(F, Q, NULL, hilb, strat, NULL);
-    r=(ideal)(rl->m[0].data);
-    rl->m[0].data=NULL;
-    rl->Clean();
-  #else
     if (w!=NULL)
       r=bba(F,Q,*w,hilb,strat);
     else
       r=bba(F,Q,NULL,hilb,strat);
-  #endif
   }
 #ifdef KDEBUG
@@ -2044 +1849 @@
   kStrategy strat=(kStrategy)Alloc0(sizeof(skStrategy));
   strat->syzComp = syzComp;
-  spSet(currRing);
   if (pOrdSgn==-1)
     p=kNF1(F,Q,p,strat,lazyReduce);
@@ -2056 +1860 @@
 {
   ideal res;
-  spSet(currRing);
   if (TEST_OPT_PROT)
   {
@@ -2088 +1891 @@
   strat->kNoether=pCopy(ppNoether);
   strat->ak = idRankFreeModule(F);
-  spSet(currRing);
   initBuchMoraCrit(strat);
   strat->NotUsedAxis = (BOOLEAN *)Alloc((pVariables+1)*sizeof(BOOLEAN));
@@ -2099 +1901 @@
   strat->tmax        = setmax;
   strat->T           = initT();
-  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
   if (pOrdSgn == -1)   strat->honey = TRUE;
   initS(F,Q,strat);

Singular/kstd1.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.h,v 1.8 1998-12-15 10:06:45 pohl Exp $ */
+/* $Id: kstd1.h,v 1.9 1999-09-29 10:59:30 obachman Exp $ */
 /*
 * ABSTRACT
@@ -25 +25 @@
 ideal kStd(ideal F, ideal Q, tHomog h, intvec ** mw,intvec *hilb=NULL,
           int syzComp=0,int newIdeal=0, intvec *vw=NULL);
-#ifdef STDTRACE
-lists TraceStd(leftv,int , ideal F, ideal Q, tHomog h, intvec ** w,intvec *hilb=NULL,
-          int syzComp=0,int newIdeal=0);
-#endif
 
 /* the following global data are defined in kutil.cc */

Singular/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.29 1999-09-27 14:58:09 obachman Exp $ */
+/* $Id: kstd2.cc,v 1.30 1999-09-29 10:59:30 obachman Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -15 +15 @@
 #include "kutil.h"
 #include "kstd1.h"
-#include "kstd2.h"
 #include "khstd.h"
-#include "spolys.h"
 #include "cntrlc.h"
 #include "weight.h"
@@ -23 +21 @@
 #include "ipshell.h"
 #include "intvec.h"
-#include "spSpolyLoop.h"
-#include "kbPolyProcs.h"
 
 // #include "timer.h"
@@ -50 +46 @@
 *  assumes homogeneous case and degree-ordering
 */
+#if 0
+static void redSyz (LObject* h,kStrategy strat)
+{
+  int j = 0,i=0,pos;
+  BOOLEAN exchanged=pDivisibleBy((*h).p2,(*h).p1);
+  poly p,q;
+
+  if (exchanged)
+  {
+    q = kFromInput((*h).p1,strat);
+    if (q==NULL)
+    {
+      exchanged = FALSE;
+    }
+    else
+    {
+      while (i<=strat->Ll)
+      {
+        if ((strat->L[i].p1==strat->P.p1) || (strat->L[i].p2==strat->P.p1))
+        {
+          deleteInL(strat->L,&strat->Ll,i,strat);
+        }
+        else
+          i++;
+      }
+      i = 0;
+    }
+  }
+  if (TEST_OPT_DEBUG)
+  {
+    PrintS("red:");
+    wrp(h->p);
+  }
+  while(1)
+  {
+    i = 0;
+    j = strat->sl + 1;
+    while (i <= strat->tl)
+    {
+      if (K_DIVISIBLE_BY(strat->T[i], h->p))
+      {
+        if ((!exchanged) && (pEqual((*h).p,strat->T[i].p)))
+        {
+          j = 0;
+          while (j<=strat->sl)
+          {
+            if (strat->S[j] == strat->T[i].p) break;
+          }
+          if (j <= strat->sl) break;
+        }
+        else
+        {
+          break;
+        }
+      }
+      i++;
+    }
+    
+    if (i > strat->tl)
+    {
+      // nothing to reduce with
+      if (exchanged)
+      {
+        assume(q!= NULL);
+        if (pGetComp((*h).p) > strat->syzComp)
+        {
+          pDelete(&((*h).p));
+          pDelete(&q);
+          return;
+        }
+        else
+        {
+          if (!TEST_OPT_INTSTRATEGY)
+          {
+            pos = posInS(strat->S,strat->sl,(*h).p);
+            pNorm((*h).p);
+            (*h).p = redtailSyz((*h).p,pos-1,strat);
+          }
+          p = (*h).p;
+          while ((pNext(p)!=NULL) && (pGetComp(pNext(p))<=strat->syzComp))
+            pIter(p);
+          pDelete(&pNext(p));
+          pNext(p) = q;
+          q = NULL;
+        }
+      }
+      else if (!TEST_OPT_INTSTRATEGY)
+      {
+        pos = posInS(strat->S,strat->sl,(*h).p);
+        pNorm((*h).p);
+        (*h).p = redtailSyz((*h).p,pos-1,strat);
+      }
+      if (q != NULL) pDelete(&q);
+      enterTBba((*h),strat->tl+1,strat);
+      return;
+    }
+
+    // found one to reduce
+    if (j <= strat->sl)
+    {
+      // might have found a better one ?
+      q = kFromInput(strat->S[j],strat);
+      if (q!=NULL)
+      {
+        exchanged = TRUE;
+        p = strat->S[j];
+        if (!TEST_OPT_INTSTRATEGY)
+          pNorm((*h).p);
+        else
+        {
+          //pContent((*h).p);
+          pCleardenom((*h).p);// also does a pContent
+        }
+        strat->S[j] = (*h).p;
+        (*h).p = p;
+         strat->T[i].p = strat->S[j];
+        for (i=0;i<=strat->Ll;i++)
+        {
+          if (strat->L[i].p1==p) strat->L[i].p1=strat->S[j];
+          if (strat->L[i].p2==p) strat->L[i].p2=strat->S[j];
+        }
+      }
+    }
+
+    if (TEST_OPT_DEBUG)
+    {
+      PrintS(" with ");
+      wrp(strat->T[i].p);
+    }
+    kbReducePoly(h, &(strat->T[i]), strat->kNoether);
+    if (TEST_OPT_DEBUG)
+    {
+      PrintS("\nto "); wrp((*h).p);PrintLn();
+    }
+    if ((*h).p == NULL)
+    {
+      if (h->lcm!=NULL) pFree1((*h).lcm);
+#ifdef KDEBUG
+      (*h).lcm=NULL;
+#endif
+      if (q != NULL) pDelete(&q);
+      return;
+    }
+  }
+}
+
+#else
+
 static void redSyz (LObject* h,kStrategy strat)
 {
@@ -118 +262 @@
         wrp(strat->S[j]);
       }
-      (*h).p = spSpolyRed(strat->S[j],(*h).p,strat->kNoether,
-                          strat->spSpolyLoop);
+      (*h).p = ksOldSpolyRed(strat->S[j],(*h).p,strat->kNoether);
       if (TEST_OPT_DEBUG)
       {
@@ -175 +318 @@
 }
 
+#endif
+
 /*2
 *  reduction procedure for the homogeneous case
@@ -219 +364 @@
 
     // now we found one which is divisible
-    kbReducePoly(h, &(strat->T[j]),
+    ksReducePoly(h, &(strat->T[j]),
                  strat->kNoether);
 #ifdef KDEBUG
@@ -284 +429 @@
       wrp(strat->T[j].p);
     }
-    kbReducePoly(h, &(strat->T[j]), strat->kNoether);
+    ksReducePoly(h, &(strat->T[j]), strat->kNoether);
     if (TEST_OPT_DEBUG)
     {
@@ -440 +585 @@
       h->p = pCopy(h->p);
     }
-    kbReducePoly(h, &(strat->T[ii]), strat->kNoether);
+    ksReducePoly(h, &(strat->T[ii]), strat->kNoether);
     if (TEST_OPT_DEBUG)
     {
@@ -527 +672 @@
       /* compute the s-polynomial */
       if (!TEST_OPT_INTSTRATEGY) pNorm((*h).p);
-      p = spSpolyShortBba(strat->T[j].p,(*h).p);
+      p = ksCreateShortSpoly(strat->T[j].p,(*h).p);
       /* computes only the first monomial of the spoly  */
       if (p)
@@ -542 +687 @@
             if (pDivisibleBy(strat->T[j].p,(*h).p))
             {
-              ph = spSpolyShortBba(strat->T[j].p,(*h).p);
+              ph = ksCreateShortSpoly(strat->T[j].p,(*h).p);
               if (ph==NULL)
               {
@@ -567 +712 @@
         }
         pFree1(p);
-        (*h).p = spSpolyRed(strat->T[jbest].p,(*h).p,strat->kNoether,
-                            strat->spSpolyLoop);
+        (*h).p = ksOldSpolyRed(strat->T[jbest].p,(*h).p,strat->kNoether);
       }
       else
@@ -649 +793 @@
         wrp(strat->S[j]);
       }
-      h = spSpolyRed(strat->S[j],h,strat->kNoether, strat->spSpolyLoop);
+      h = ksOldSpolyRed(strat->S[j],h,strat->kNoether);
       if (TEST_OPT_DEBUG)
       {
@@ -775 +919 @@
       pFree1(strat->P.p);
       /* the real one */
-      kbCreateSpoly(&(strat->P),
+      ksCreateSpoly(&(strat->P),
                     strat->kNoether);
     }
@@ -890 +1034 @@
   /*- set S -*/
   strat->sl = -1;
-  strat->spSpolyLoop = spGetSpolyLoop(currRing, max(strat->ak, pMaxComp(q)),
-                                      strat->syzComp, FALSE);
   /*- init local data struct.---------------------------------------- -*/
   /*Shdl=*/initS(F,Q,strat);
@@ -935 +1077 @@
   /*- set S -*/
   strat->sl = -1;
-  strat->spSpolyLoop =  spGetSpolyLoop(currRing,
-                                       max(strat->ak, idRankFreeModule(q)),
-                                       strat->syzComp, FALSE);
   /*- init local data struct.---------------------------------------- -*/
   /*Shdl=*/initS(F,Q,strat);
@@ -1029 +1168 @@
   }
   strat->homog=h;
-  spSet(currRing);
-  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
   initBuchMoraCrit(strat); /*set Gebauer, honey, sugarCrit*/
   initBuchMoraPos(strat);

Singular/kstdfac.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstdfac.cc,v 1.23 1999-09-27 15:04:58 obachman Exp $ */
+/* $Id: kstdfac.cc,v 1.24 1999-09-29 10:59:31 obachman Exp $ */
 /*
 *  ABSTRACT -  Kernel: factorizing alg. of Buchberger
@@ -15 +15 @@
 #include "kutil.h"
 #include "kstd1.h"
-#include "kstd2.h"
 #include "khstd.h"
-#include "spolys.h"
 #include "cntrlc.h"
 #include "weight.h"
-//#include "ipid.h"
 #include "ipshell.h"
 #include "intvec.h"
@@ -28 +25 @@
 #include "lists.h"
 #include "ideals.h"
-#include "spSpolyLoop.h"
 #include "timer.h"
 #include "kstdfac.h"
@@ -207 +203 @@
   s->fromT=o->fromT;
   s->noetherSet=o->noetherSet;
-  s->spSpolyLoop = o->spSpolyLoop;
   return s;
 }
@@ -453 +448 @@
       pFree1(strat->P.p);
       /* the real one */
-      strat->P.p = spSpolyCreate(strat->P.p1,
-                                 strat->P.p2,
-                                 strat->kNoether,
-                                 strat->spSpolyLoop);
+      strat->P.p = ksOldCreateSpoly(strat->P.p1,
+                                    strat->P.p2,
+                                    strat->kNoether);
     }
     if (strat->honey)
@@ -783 +777 @@
   }
   strat->homog=h;
-  spSet(currRing);
-  strat->spSpolyLoop = spGetSpolyLoop(currRing, strat);
   initBuchMoraCrit(strat); /*set Gebauer, honey, sugarCrit*/
   initBuchMoraPos(strat);

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.36 1999-09-27 14:57:11 obachman Exp $ */
+/* $Id: kutil.cc,v 1.37 1999-09-29 10:59:31 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -12 +12 @@
 #include "tok.h"
 #include "febase.h"
-#include "spolys.h"
 #include "mmemory.h"
 #include "numbers.h"
 #include "polys.h"
-//#include "ipid.h"
 #include "ring.h"
 #include "ideals.h"
@@ -25 +23 @@
 #include "kstd1.h"
 #include "kutil.h"
-#include "spSpolyLoop.h"
-//#include "longrat.h"
 
 static poly redMora (poly h,int maxIndex,kStrategy strat);
 static poly redBba (poly h,int maxIndex,kStrategy strat);
 
-//int     cp, c3;
-//BOOLEAN interpt;
-//BOOLEAN news=FALSE;
-//static BOOLEAN newt=FALSE;/*used for messageSets*/
 BITSET  test=(BITSET)0;
-//int     ak;
-//int     syzComp=0;
 int     HCord;
-//LObject P;
-//poly    tail;
-//BOOLEAN *pairtest;/*used for enterOnePair*/
-//int    // LazyPass=100,
-//        LazyDegree=1;
 int        Kstd1_deg;
 int        mu=32000;
-
-//polyset S;
-//int     sl;
-//ideal   Shdl;
-//intset  ecartS;
-//intset  fromQ;
-
-//TSet    T;
-//int     tl;
-//int     tmax;
-
-//LSet    L;
-//int     Ll;
-//int     Lmax;
-
-//LSet    B;
-//int     Bl;
-//int     Bmax;
-
-//BOOLEAN kActive=FALSE;
-//BOOLEAN fromT = FALSE;
-//BOOLEAN honey, sugarCrit;/*option 5*/
-//BOOLEAN Gebauer;
-//BOOLEAN * NotUsedAxis;
-//BOOLEAN homog;
-//BOOLEAN noTailReduction = FALSE;
-
-/*0 implementation*/
-/*
-*static void deleteHCn(poly* p)
-*{
-*  poly p1;
-*  if (pHEdgeFound && (*p))
-*  {
-*    if (pComp0(*p,pNoether) == -1)
-*    {
-*      pDelete(p);
-*      return;
-*    }
-*    p1 = *p;
-*    while (pNext(p1))
-*    {
-*      if (pComp0(pNext(p1), pNoether) == -1) pDelete(&pNext(p1));
-*      else                                  pIter(p1);
-*    }
-*  }
-*}
-*/
 
 /*2
@@ -608 +545 @@
   pLcm(p,strat->S[i],Lp.lcm);
   pSetm(Lp.lcm);
-#ifdef DRING
-//  if ((pDRING) && (pdDFlag(Lp.lcm)==0))
-//  {
-//    for(j=1;j<=pdN;j++)
-//    {
-//      if((Lp.pGetExp(lcm,pdX(j))>0)
-//      &&(Lp.pGetExp(lcm,pdIX(j))>0))
-//      {
-//        pFree1(Lp.lcm);
-//        Lp.lcm=NULL;
-//        return;
-//      }
-//    }
-//    /*delete pairs with lcm contains x_j^a*x_j^(-b)*/
-//  }
-#endif
   if (strat->sugarCrit)
   {
     if(
-#ifdef SDRING
-    (!pSDRING) &&
-#endif
     (!((strat->ecartS[i]>0)&&(ecart>0)))
     && pHasNotCF(p,strat->S[i]))
@@ -665 +583 @@
     *if the leading term of r devides lcm(s,p) then (s,p) will not enter B
     */
-#ifdef SDRING
-    if (!pSDRING)
-#endif
     {
       j = strat->Bl;
@@ -699 +614 @@
   {
     if(/*(strat->ak==0) && productCrit(p,strat->S[i])*/
-#ifdef SDRING
-    (!pSDRING) &&
-#endif
     pHasNotCF(p,strat->S[i]))
     {
@@ -734 +646 @@
     *if the leading term of r devides lcm(s,p) then (s,p) will not enter B
     */
-#ifdef SDRING
-    if (!pSDRING)
-#endif
     for(j = strat->Bl;j>=0;j--)
     {
@@ -769 +678 @@
     Lp.p=NULL;
   else
-#ifdef SDRING
-  // spSpolyShortBba will not work for SDRING
-  if (pSDRING)
-  {
-    Lp.p=spSpolyCreate(strat->S[i],p,strat->kNoether,strat->spSpolyLoop);
-    if (Lp.p!=NULL)
-      pDelete(&pNext(Lp.p));
-  }
-  else
-#endif
-  {
-    Lp.p = spSpolyShortBba(strat->S[i],p);
+  {
+    Lp.p = ksCreateShortSpoly(strat->S[i],p);
   }
   if (Lp.p == NULL)
@@ -814 +713 @@
     enterL(&strat->B,&strat->Bl,&strat->Bmax,Lp,l);
   }
-#ifdef DRING
-  if ((pDRING) && (pdDFlag(strat->S[i])==0) && (pdDFlag(p)==0))
-  {
-    Lp.lcm=pOne();
-    pdLcm(strat->S[i],p,Lp.lcm);
-    Lp.p1 = strat->S[i];
-    Lp.p2 = p;
-    Lp.p = pdSpolyCreate(strat->S[i],p);
-    if (Lp.p!=NULL)
-    {
-      /*spoly of p and S[i] bzgl Lp.lcm*/
-      strat->initEcartPair(&Lp,strat->S[i],p,strat->ecartS[i],ecart);
-      l = strat->posInL(strat->B,strat->Bl,Lp,strat);
-      enterL(&strat->B,&strat->Bl,&strat->Bmax,Lp,l);
-    }
-  }
-#endif
 }
 
@@ -845 +727 @@
   pLcm(p,strat->S[i],Lp.lcm);
   pSetm(Lp.lcm);
-  if(
-#ifdef SDRING
-  (!pSDRING) &&
-#endif
-  (pHasNotCF(p,strat->S[i])))
+  if(pHasNotCF(p,strat->S[i]))
   {
     strat->cp++;
@@ -873 +751 @@
   /*-  compute the short s-polynomial -*/
 
-#ifdef SDRING
-  // spSpolyShortBba will not work for SDRING
-  if (pSDRING)
-  {
-    Lp.p=spSpolyCreate(strat->S[i],p,strat->kNoether,strat->spSpolyLoop);
-    if (Lp.p!=NULL)
-      pDelete(&pNext(Lp.p));
-  }
-  else
-#endif
-  {
-    Lp.p = spSpolyShortBba(strat->S[i],p);
-  }
+  Lp.p = ksCreateShortSpoly(strat->S[i],p);
   if (Lp.p == NULL)
   {
@@ -904 +770 @@
     enterL(&strat->L,&strat->Ll,&strat->Lmax,Lp,l);
   }
-#ifdef DRING
-  if ((pDRING) && (pdDFlag(strat->S[i])==0) && (pdDFlag(p)==0))
-  {
-    Lp.lcm=pOne();
-    pdLcm(strat->S[i],p,Lp.lcm);
-    Lp.p1 = strat->S[i];
-    Lp.p2 = p;
-    Lp.p = pdSpolyCreate(strat->S[i],p);
-    if (Lp.p!=NULL)
-    {
-      /*spoly of p and S[i] bzgl Lp.lcm*/
-      strat->initEcartPair(&Lp,strat->S[i],p,strat->ecartS[i],ecart);
-      l = strat->posInL(strat->B,strat->Bl,Lp,strat);
-      enterL(&strat->B,&strat->Bl,&strat->Bmax,Lp,l);
-    }
-  }
-#endif
 }
 
@@ -938 +787 @@
   if (strat->pairtest!=NULL)
   {
-#ifdef SDRING
-    if (!pSDRING)
-#endif
     {
       /*- i.e. there is an i with pairtest[i]==TRUE -*/
@@ -961 +807 @@
     strat->pairtest=NULL;
   }
-  if ((strat->Gebauer || strat->fromT)
-#ifdef SDRING
-  && (!pSDRING)
-#endif
-  )
+  if (strat->Gebauer || strat->fromT)
   {
     if (strat->sugarCrit)
@@ -1074 +916 @@
   else
   {
-#ifdef SDRING
-    if (!pSDRING)
-#endif
     for (j=strat->Ll; j>=0; j--)
     {
@@ -1109 +948 @@
     strat->Bl = -1;
     j = strat->Ll;
-#ifdef SDRING
-    if (!pSDRING)
-#endif
     loop  /*cannot be changed into a for !!! */
     {
@@ -2351 +2187 @@
       )
       {
-        spSpolyTail(strat->S[j], p, h, strat->kNoether, strat->spSpolyLoop);
+        ksOldSpolyTail(strat->S[j], p, h, strat->kNoether);
         hn = pNext(h);
         if (hn == NULL)
@@ -2396 +2232 @@
       {
         strat->redTailChange=TRUE;
-        spSpolyTail(strat->S[j], p, h, strat->kNoether, strat->spSpolyLoop);
+        ksOldSpolyTail(strat->S[j], p, h, strat->kNoether);
         hn = pNext(h);
         if (hn == NULL)
@@ -2437 +2273 @@
       if (pDivisibleBy(strat->S[j], hn) && (!pEqual(strat->S[j],h)))
       {
-        spSpolyTail(strat->S[j], p, h, strat->kNoether, strat->spSpolyLoop);
+        ksOldSpolyTail(strat->S[j], p, h, strat->kNoether);
         hn = pNext(h);
         if (hn == NULL)
@@ -2544 +2380 @@
   LObject h;
   int   i,pos;
-#ifdef SDRING
-  polyset aug=(polyset)Alloc(setmax*sizeof(poly));
-  int augmax=setmax, augl=-1;
-#endif
 
   h.ecart=0; h.length=0;
@@ -2600 +2432 @@
     {
       h.p = pCopy(F->m[i]);
-#ifdef SDRING
-      aug[0]=h.p;
-      augl=0;
-#ifdef SRING
-      if (pSRING)
-        psAug(pCopy(h.p),pOne(),&aug,&augl,&augmax);
-#endif
-#ifdef DRING
-      if (pDRING)
-        pdAug(pCopy(h.p),&aug,&augl,&augmax);
-#endif
-      for (augl++;augl != 0;)
-      {
-        h.p=aug[--augl];
-#ifdef KDEBUG
-        pHeapTest(h.p, h.heap);
-#endif
-#ifdef KDEBUG
-        if (TEST_OPT_DEBUG && pSDRING)
-        {
-          PrintS("new (aug) s:");
-          wrp(h.p);
-          PrintLn();
-        }
-#endif
-#endif
         if (TEST_OPT_INTSTRATEGY)
         {
@@ -2656 +2462 @@
           strat->enterS(h,pos,strat);
         }
-#ifdef SDRING
-      }
-#endif
     }
   }
@@ -2666 +2469 @@
     while (strat->sl>0) deleteInS(strat->sl,strat);
   }
-#ifdef SDRING
-  Free((ADDRESS)aug,augmax*sizeof(poly));
-#endif
 }
 
@@ -2675 +2475 @@
   LObject h;
   int   i,pos;
-#ifdef SDRING
-  polyset aug=(polyset)Alloc(setmax*sizeof(poly));
-  int augmax=setmax, augl=-1;
-#endif
 
   h.ecart=0; h.length=0;
@@ -2734 +2530 @@
       h.p2=NULL;
       h.lcm=NULL;
-#ifdef SDRING
-      aug[0]=h.p;
-      augl=0;
-#ifdef SRING
-      if (pSRING)
-        psAug(pCopy(h.p),pOne(),&aug,&augl,&augmax);
-#endif
-#ifdef DRING
-      if (pDRING)
-        pdAug(pCopy(h.p),&aug,&augl,&augmax);
-#endif
-      for (augl++;augl != 0;)
-      {
-        h.p=aug[--augl];
-#ifdef KDEBUG
-        pTest(h.p);
-#endif
-#ifdef SDRING
-        if (TEST_OPT_DEBUG && pSDRING)
-        {
-          PrintS("new (aug) s:");
-          wrp(h.p);
-          PrintLn();
-        }
-#endif
-#endif
         if (TEST_OPT_INTSTRATEGY)
         {
@@ -2790 +2560 @@
           enterL(&strat->L,&strat->Ll,&strat->Lmax,h,pos);
         }
-#ifdef SDRING
-      }
-#endif
     }
   }
@@ -2800 +2567 @@
     while (strat->Ll>0) deleteInL(strat->L,&strat->Ll,strat->Ll-1,strat);
   }
-#ifdef SDRING
-  Free((ADDRESS)aug,augmax*sizeof(poly));
-#endif
 }
 
@@ -2813 +2577 @@
   LObject h;
   int   i,pos;
-#ifdef SDRING
-  polyset aug=(polyset)Alloc(setmax*sizeof(poly));
-  int augmax=setmax, augl=-1;
-#endif
 
   h.ecart=0; h.length=0;
@@ -2950 +2710 @@
     }
   }
-#ifdef SDRING
-  Free((ADDRESS)aug,augmax*sizeof(poly));
-#endif
 }
 /*2
@@ -2965 +2722 @@
   {
     if (pDivisibleBy(strat->S[j],h))
-       return spSpolyRedNew(strat->S[j],h,strat->kNoether, strat->spSpolyLoop);
+       return ksOldSpolyRedNew(strat->S[j],h,strat->kNoether);
     else j++;
   }
@@ -3038 +2795 @@
     if (pDivisibleBy(strat->S[j],h))
     {
-      h = spSpolyRed(strat->S[j],h,strat->kNoether, strat->spSpolyLoop);
+      h = ksOldSpolyRed(strat->S[j],h,strat->kNoether);
       if (h==NULL) return NULL;
       j = start;
@@ -3059 +2816 @@
     if (pDivisibleBy(strat->S[j],h))
     {
-      h = spSpolyRed(strat->S[j],h,strat->kNoether, strat->spSpolyLoop);
+      h = ksOldSpolyRed(strat->S[j],h,strat->kNoether);
       if (h==NULL) return NULL;
       j = 0;
@@ -3087 +2844 @@
       && ((e >= strat->ecartS[j]) || strat->kHEdgeFound))
       {
-        h1 = spSpolyRedNew(strat->S[j],h,strat->kNoether, strat->spSpolyLoop);
+        h1 = ksOldSpolyRedNew(strat->S[j],h,strat->kNoether);
         if(TEST_OPT_DEBUG)
         {
@@ -3116 +2873 @@
   int i, suc=0;
   poly redSi=NULL;
-#ifdef SDRING
-  polyset aug=(polyset)Alloc(setmax*sizeof(poly));
-  int augmax=setmax;
-  int augl;
-  int pos;
-  BOOLEAN recursiv=FALSE;
-#endif
 
 //Print("nach initS: updateS start mit sl=%d\n",(strat->sl));
@@ -3166 +2916 @@
             i--;
           }
-#ifdef SDRING
-          else if ((pSDRING) && (pComp(redSi,strat->S[i])!=0))
-          {
-            pDelete(&redSi);
-            redSi=strat->S[i];
-            strat->S[i]=NULL;
-            deleteInS(i,strat);
-            suc=0;
-            i=0;
-            aug[0]=redSi;
-            augl=0;
-#ifdef SRING
-            if (pSRING) psAug(pCopy(redSi),pOne(),&aug,&augl,&augmax);
-#endif
-#ifdef DRING
-            if (pDRING) pdAug(pCopy(redSi),&aug,&augl,&augmax);
-#endif
-            redSi=NULL;
-            if (augl>0) recursiv=TRUE;
-            while (augl >= 0)
-            {
-              h.p=aug[augl];
-              pHeapTest(h.p, p.heap);
-              if (h.p!=NULL)
-              {
-                if (TEST_OPT_DEBUG)
-                {
-                  Print("new (aug %d) s:",augl);
-                  wrp(h.p);
-                  PrintLn();
-                }
-                if (TEST_OPT_INTSTRATEGY)
-                {
-                  //pContent(h.p);
-                  pCleardenom(h.p);// also does a pContent
-                }
-                else
-                {
-                  pNorm(h.p);
-                }
-                strat->initEcart(&h);
-                pos = posInS(strat->S,strat->sl,h.p);
-                strat->enterS(h,pos,strat);
-              }
-              augl--;
-            }
-          }
-#endif
           else
           {
@@ -3237 +2939 @@
       {
         if (((strat->fromQ==NULL) || (strat->fromQ[i]==0))
-#ifdef SDRING
-        && (!pSDRING)
-#endif
         )
           h.p = redtailBba(strat->S[i],i-1,strat);
@@ -3275 +2974 @@
             i--;
           }
-#ifdef SDRING
-          else if ((pSDRING) && (pComp(redSi,(strat->S)[i])!=0))
-          {
-            pDelete(&redSi);
-            redSi=(strat->S)[i];
-            (strat->S)[i]=NULL;
-            deleteInS(i,strat);
-            i--;
-            aug[0]=redSi;
-            augl=0;
-#ifdef SRING
-            if (pSRING) psAug(pCopy(redSi),pOne(),&aug,&augl,&augmax);
-#endif
-#ifdef DRING
-            if (pDRING) pdAug(pCopy(redSi),&aug,&augl,&augmax);
-#endif
-            redSi=NULL;
-            if (augl>0) recursiv=TRUE;
-            for (augl++;augl != 0;)
-            {
-              h.p=aug[--augl];
-#ifdef KDEBUG
-              if (TEST_OPT_DEBUG)
-              {
-                PrintS("new (aug) s:");
-                wrp(h.p);
-                PrintLn();
-              }
-#endif
-              if (!TEST_OPT_INTSTRATEGY)
-                pNorm(h.p);
-              else
-              {
-                //pContent(h.p);
-                pCleardenom(h.p);// also does a pContent
-              }
-              strat->initEcart(&h);
-              pos = posInS(strat->S,strat->sl,h.p);
-              strat->enterS(h,pos,strat);
-            }
-          }
-#endif
           else if (TEST_OPT_INTSTRATEGY)
           {
@@ -3354 +3011 @@
     {
       if (((strat->fromQ==NULL) || (strat->fromQ[i]==0))
-#ifdef SDRING
-      && (!pSDRING)
-#endif
       )
       {
@@ -3376 +3030 @@
   }
   if (redSi!=NULL) pDelete1(&redSi);
-#ifdef SDRING
-  Free((ADDRESS)aug,augmax*sizeof(poly));
-  if (recursiv) updateS(FALSE,strat);
-#endif
 #ifdef KDEBUG
   kTest(strat);
@@ -3393 +3043 @@
   int i;
 
-#ifdef SDRING
-  if (pSDRING
-  && (atS<=strat->sl)
-  && pComparePolys(p.p,strat->S[atS]))
-  {
-    if (TEST_OPT_PROT)
-      PrintS("m");
-    p.p=NULL;
-    return;
-  }
-  if (pSDRING
-  && (atS<strat->sl)
-  && pComparePolys(p.p,strat->S[atS+1]))
-  {
-    if (TEST_OPT_PROT)
-      PrintS("m");
-    p.p=NULL;
-    return;
-  }
-  if (pSDRING
-  && (atS>0)
-  && pComparePolys(p.p,strat->S[atS-1]))
-  {
-    if (TEST_OPT_PROT)
-      PrintS("m");
-    p.p=NULL;
-    return;
-  }
-#endif
   strat->news = TRUE;
   /*- puts p to the standardbasis s at position at -*/
@@ -3664 +3285 @@
   else
   {
-    #ifdef SDRING
-    if (
-    #ifdef SRING
-        pSRING ||
-    #endif
-    #ifdef DRING
-        pDRING ||
-    #endif
-        0)
-         initS(F, Q,strat); /*sets also S, ecartS, fromQ */
-    else
-    #endif
     /*Shdl=*/initSL(F, Q,strat); /*sets also S, ecartS, fromQ */
     // /*Shdl=*/initS(F, Q,strat); /*sets also S, ecartS, fromQ */

Singular/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.15 1999-09-27 14:57:12 obachman Exp $ */
+/* $Id: kutil.h,v 1.16 1999-09-29 10:59:32 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -68 +68 @@
     int (*posInLOld)(const LSet Ls,const int Ll,
                      const LObject &Lo,const kStrategy strat);
-    void (*spSpolyLoop)(poly p1, poly p2, poly m, poly spNoether);
     pFDegProc pOldFDeg;
     ideal Shdl;
@@ -173 +172 @@
 BOOLEAN newHEdge(polyset S, int ak,kStrategy strat);
 
-rOrderType_t spGetOrderType(ring r, int modrank, int syzcomp);
-extern int spCheckCoeff(number *a, number *b);
-
 inline TSet initT () { return (TSet)Alloc0(setmax*sizeof(TObject)); }
 
@@ -197 +193 @@
 #endif
 
+/***************************************************************
+ *
+ * From kstd2.cc
+ * 
+ ***************************************************************/
+ideal bba (ideal F, ideal Q,intvec *w,intvec *hilb,kStrategy strat);
+poly kNF2 (ideal F, ideal Q, poly q, kStrategy strat, int lazyReduce);
+ideal kNF2 (ideal F,ideal Q,ideal q, kStrategy strat, int lazyReduce);
+void initBba(ideal F,kStrategy strat);
+
+/***************************************************************
+ *
+ * From kSpolys.cc
+ * 
+ ***************************************************************/
+// Reduces PR with PW
+// Assumes PR != NULL, PW != NULL, Lm(PW) divides Lm(PR)
+// Changes: PR
+// Const:   PW
+// If coef != NULL, then *coef is a/gcd(a,b), where a = LC(PR), b = LC(PW)
+void ksReducePoly(LObject* PR,
+                  TObject* PW,
+                  poly spNoether = NULL,
+                  number *coef = NULL);
+
+// Reduces PR at Current->next with PW
+// Assumes PR != NULL, Current contained in PR 
+//         Current->next != NULL, LM(PW) devides LM(Current->next)
+// Changes: PR
+// Const:   PW
+void ksReducePolyTail(LObject* PR,
+                      TObject* PW,
+                      poly Current,
+                      poly spNoether = NULL);
+
+// Creates S-Poly of Pair
+// Const:   Pair->p1, Pair->p2
+// Changes: Pair->p == S-Poly of p1, p2
+// Assume:  Pair->p1 != NULL && Pair->p2
+void ksCreateSpoly(LObject* Pair, 
+                   poly spNoether = NULL);
+
+
+/*2
+* creates the leading term of the S-polynomial of p1 and p2
+* do not destroy p1 and p2
+* remarks:
+*   1. the coefficient is 0 (nNew)
+*   2. pNext is undefined
+*/
+poly ksCreateShortSpoly(poly p1, poly p2);
+
+
+/*
+* input - output: a, b
+* returns:
+*   a := a/gcd(a,b), b := b/gcd(a,b)
+*   and return value
+*       0  ->  a != 1,  b != 1
+*       1  ->  a == 1,  b != 1
+*       2  ->  a != 1,  b == 1
+*       3  ->  a == 1,  b == 1
+*   this value is used to control the spolys
+*/
+int ksCheckCoeff(number *a, number *b);
+
+// old stuff
+poly ksOldSpolyRed(poly p1, poly p2, poly spNoether = NULL);
+poly ksOldSpolyRedNew(poly p1, poly p2, poly spNoether = NULL);
+poly ksOldCreateSpoly(poly p1, poly p2, poly spNoether = NULL);
+void ksOldSpolyTail(poly p1, poly q, poly q2, poly spNoether);
 
 #ifdef HAVE_SHORT_EVECTORS

Singular/mmheap.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmheap.h,v 1.9 1999-09-27 15:05:25 obachman Exp $ */
+/* $Id: mmheap.h,v 1.10 1999-09-29 10:59:33 obachman Exp $ */
 #include <stdlib.h>
 #include "mod2.h"
@@ -56 +56 @@
  *
  *****************************************************************/
-
 #ifndef HEAP_DEBUG
 
@@ -89 +88 @@
   
 #endif
+/* use this for unknown heaps */
+#define MM_UNKNOWN_HEAP ((memHeap) 1)
 
 /*****************************************************************

Singular/mod2.h.in

@@ -5 +5 @@
  *          DO NOT EDIT!
  *
- *  Version: $Id: mod2.h.in,v 1.68 1999-09-27 14:37:13 obachman Exp $
+ *  Version: $Id: mod2.h.in,v 1.69 1999-09-29 10:59:33 obachman Exp $
  *******************************************************************/
 #ifndef MOD2_H
@@ -157 +157 @@
 /* Define to enable TCL interface */
 #undef HAVE_TCL 
-/* Define to enable working in Weyl algebras */
-#undef DRING
-/* Define to enable working in exterior algebras */
-#undef SRING
 
 /* Undefine to disable Gerhard's and Wilfried's fast and dirty std computations */
@@ -244 +240 @@
 
 #define SINGULAR_VERSION (SINGULAR_MAJOR_VERSION*1000 + SINGULAR_MINOR_VERSION*100 + SINGULAR_SUB_VERSION)
-#ifdef DRING
-#define SDRING
-#endif
-
-#ifdef SRING
-#define SDRING
-#endif
 
 #if SIZEOF_EXPONENT == 1
@@ -365 +354 @@
 #endif
 
-
-/* define PDEBUG checking polys, undefine otherwise */
-/* define PDEBUG 1 for additionally checking access to polys  -- vewry slow !*/
-#define PDEBUG 1
-/* define KDEBUG checking during standard base computation */
-#define KDEBUG
+/* undef PDEBUG to disable checks of polys
+ *
+ * define PDEBUG to
+ * 0 for basic, explicitely requested tests
+ * 1 for tests in pProcs
+ * 2 for low-level tests (Exponent access, primitive monom operations)
+ * NOTE: for PDEBUG > 1 it gets very slow
+ *       You can locally enable tests in pProcs by setting the 
+ *       define at the beginning of pProcs.cc
+ */
+#define PDEBUG 0
+
+/* undef KDEBUG for checck of data during std computations 
+ *
+ * define KDEBUG to
+ * 0 for basic tests
+ * 1 for tests in kSpoly 
+ * NOTE: You can locally enable tests in kspoly by setting the 
+ *       define at the beginning of kspoly.cc
+ */
+#define KDEBUG 0
+
 /* define LDEBUG checking numbers, undefine otherwise */
 #define LDEBUG

Singular/mpsr_Error.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr_Error.cc,v 1.9 1999-09-27 15:05:26 obachman Exp $ */
+/* $Id: mpsr_Error.cc,v 1.10 1999-09-29 10:59:34 obachman Exp $ */
 
 /***************************************************************
@@ -54 +54 @@
 {
   mpsr_SetError(mpsr_MP_Failure);
-  mpsr_MP_errno = link->MP_errno;
+  mpsr_MP_errno = (enum MP_Errors) link->MP_errno;
   return mpsr_MP_Failure;
 }

Singular/numbers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: numbers.cc,v 1.19 1999-09-16 12:34:00 Singular Exp $ */
+/* $Id: numbers.cc,v 1.20 1999-09-29 10:59:34 obachman Exp $ */
 
 /*
@@ -21 +21 @@
 #include "gnumpc.h"
 #include "ring.h"
-#ifndef FAST_AND_DIRTY
-#undef npMultM
-#undef npSubM
-#undef npNegM
-#undef npEqualM
-#endif
 #include "ffields.h"
 #include "shortfl.h"

Singular/numbers.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: numbers.h,v 1.9 1999-09-16 12:34:01 Singular Exp $ */
+/* $Id: numbers.h,v 1.10 1999-09-29 10:59:34 obachman Exp $ */
 /*
 * ABSTRACT: interface to coefficient aritmetics
@@ -68 +68 @@
 void nSetChar(ring r, BOOLEAN complete);
 
-#ifndef FAST_AND_DIRTY
-#define npMultM  nMult
-#define npSubM   nSub
-#define npNegM   nNeg
-#define npEqualM nEqual
 #endif
-
-#endif

Singular/polys-comp.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys-comp.h,v 1.11 1999-09-27 15:05:28 obachman Exp $ */
+/* $Id: polys-comp.h,v 1.12 1999-09-29 10:59:35 obachman Exp $ */
 
 /***************************************************************
@@ -358 +358 @@
 {
   long d;
-  long _i = currRing->pCompLSize - 1;
-  register const long* s1 = &(p1->exp.l[currRing->pCompHighIndex]);
-  register const long* s2 = &(p2->exp.l[currRing->pCompHighIndex]);
+  unsigned long _i = currRing->pCompLSize - 1;
+  register const unsigned long* s1 = &(p1->exp.l[currRing->pCompHighIndex]);
+  register const unsigned long* s2 = &(p2->exp.l[currRing->pCompHighIndex]);
 
   for (;;)

Singular/polys-impl.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys-impl.h,v 1.34 1999-09-29 09:52:38 Singular Exp $ */
+/* $Id: polys-impl.h,v 1.35 1999-09-29 10:59:36 obachman Exp $ */
 
 /***************************************************************
@@ -41 +41 @@
 typedef Exponent_t* Exponent_pt;
 
-typedef long Order_t;
+typedef unsigned long Order_t;
 struct  spolyrec
 {
@@ -324 +324 @@
 {
   int i = currRing->ExpLSize;
-  long* s1 = &(p1->exp.l[0]);
-  const long* s2 = &(p2->exp.l[0]);
+  unsigned long* s1 = &(p1->exp.l[0]);
+  const unsigned long* s2 = &(p2->exp.l[0]);
   for (;;)
   {
@@ -345 +345 @@
 {
   int i = currRing->ExpLSize;
-  long* s1 = &(p1->exp.l[0]);
-  const long* s2 = &(p2->exp.l[0]);
+  unsigned long* s1 = &(p1->exp.l[0]);
+  const unsigned long* s2 = &(p2->exp.l[0]);
 
   for (;;)
@@ -367 +367 @@
 #endif // defined(PDEBUG) && PDEBUG > 1
 {
-  long* s1 = &(p1->exp.l[0]);
-  const long* s2 = &(p2->exp.l[0]);
-  const long* s3 = &(p3->exp.l[0]);
-  const long* const ub = s3 + currRing->ExpLSize;
+  unsigned long* s1 = &(p1->exp.l[0]);
+  const unsigned long* s2 = &(p2->exp.l[0]);
+  const unsigned long* s3 = &(p3->exp.l[0]);
+  const unsigned long* const ub = s3 + currRing->ExpLSize;
 
   p1->next = p2->next;
@@ -484 +484 @@
 DECLARE(BOOLEAN, _pEqual(poly p1, poly p2))
 {
-  const long *s1 = (long*) &(p1->exp.l[0]);
-  const long *s2 = (long*) &(p2->exp.l[0]);
-  const long* const lb = s1 + currRing->ExpLSize;
+  const unsigned long *s1 = (unsigned long*) &(p1->exp.l[0]);
+  const unsigned long *s2 = (unsigned long*) &(p2->exp.l[0]);
+  const unsigned long* const lb = s1 + currRing->ExpLSize;
 
   for(;;)

Singular/polys.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.42 1999-09-28 15:02:32 obachman Exp $ */
+/* $Id: polys.cc,v 1.43 1999-09-29 10:59:36 obachman Exp $ */
 
 /*
@@ -54 +54 @@
 /* 1 for c ordering, -1 otherwise (i.e. for C ordering) */
 int  pComponentOrder;
-
-#ifdef DRING
-int      p2;
-BOOLEAN  pDRING=FALSE;
-#endif
-
-#ifdef SRING
-int      pAltVars;
-BOOLEAN  pSRING=FALSE;
-#endif
-
-#ifdef SDRING
-BOOLEAN  pSDRING=FALSE;
-#include "polys.inc"
-#endif
 
 /* ----------- global variables, set by procedures from hecke/kstd1 ----- */
@@ -719 +704 @@
   pComponentOrder=1;
   if (ppNoether!=NULL) pDelete(&ppNoether);
-#ifdef SRING
-  pSRING=FALSE;
-  pAltVars=r->N+1;
-#endif
   pVariables = r->N;
 
@@ -861 +842 @@
   poly aa=a;
   poly prev=NULL;
-#ifdef SDRING
-  poly pDRINGres=NULL;
-#endif
 
   pMultT_nok = pGetComp(exp);
@@ -883 +861 @@
     else
     {
-#ifdef DRING
-      if (pDRING)
-      {
-         if (pdDFlag(a)==1)
-         {
-           if (pdDFlag(exp)==1)
-           {
-             pDRINGres=pAdd(pDRINGres,pMultDD(a,exp));
-           }
-           else
-           {
-             pDRINGres=pAdd(pDRINGres,pMultDT(a,exp));
-           }
-         }
-         else
-         {
-           if (pdDFlag(exp)==1)
-           {
-             pDRINGres=pAdd(pDRINGres,pMultDD(a,exp));
-           }
-           else
-           {
-             pDRINGres=pAdd(pDRINGres,pMultTT(a,exp));
-           }
-         }
-      }
-      else
-#endif
-#ifdef SRING
-      if (pSRING)
-      {
-        pDRINGres=pAdd(pDRINGres,psMultM(a,exp));
-      }
-      else
-#endif
       {
         if (pMultT_nok)  /* comp of exp != 0 */
@@ -933 +876 @@
   }
   pMultT_nok=0;
-#ifdef SDRING
-  if (
-  #ifdef DRING
-  pDRING ||
-  #endif
-  #ifdef SRING
-  pSRING ||
-  #endif
-  0 )
-  {
-    pDelete(&aa);
-    pTest(pDRINGres);
-    return pDRINGres;
-  }
-#endif
   pTest(aa);
   return aa; /*TRUE*/
@@ -1187 +1115 @@
   else
   {
-#ifdef DRING
-    if (pDRING)
-    {
-      for(i=1;i<=pdN;i++)
-      {
-        if(pGetExp(rc,pdDX(i))>0)
-        {
-          pdSetDFlag(rc,1);
-          break;
-        }
-      }
-    }
-#endif
     pSetm(rc);
   }
@@ -1589 +1504 @@
 BOOLEAN pHasNotCF(poly p1, poly p2)
 {
-#ifdef SRING
-  if (pSRING)
-    return FALSE;
-#endif
 
   if (pGetComp(p1) > 0 || pGetComp(p2) > 0)

Singular/polys.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.h,v 1.23 1999-09-28 15:01:20 obachman Exp $ */
+/* $Id: polys.h,v 1.24 1999-09-29 10:59:37 obachman Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate polynomials
@@ -20 +20 @@
 extern int pComponentOrder;
 
-#ifdef DRING
-// D=k[x,d,y] is the Weyl-Algebra [y], y commuting with all others
-// M=k[x,x^(-1),y] is a D-module
-// all x(1..n),d,x(1..n)^(-1),y(1..k) are considered as "ring variables" v(1..N)
-// the map from x(i) to v:
-#define pdX(i)  (i)
-// d(i)
-#define pdDX(i) (pdN+i)
-// x(i)^(-1)
-#define pdIX(i) (pdN+i)
-// y(i)
-#define pdY(i)  (pdN*2+i+1)
-// a monomial m belongs to a D-module M iff pdDFlag(m)==0
-// a monomial m belongs to an ideal in the Weyl-Algebra D iff pdDFlag(m)==1
-#define pdDFlag(m) pGetExp(m,pdN*2+1)
-#define pdSetDFlag(m,i) pSetExp(m,pdN*2+1,i)
-
-extern int      pdN;
-extern int      pdK;
-extern BOOLEAN  pDRING;
-poly   pdSpolyCreate(poly a, poly b);
-void   pdLcm(poly a, poly b, poly m);
-BOOLEAN pdIsConstantComp(poly p);
-void   spModuleToPoly(poly a1);
-void   pdSetDFlagP(poly p,int i);
-#endif
-#ifdef SRING
-extern int      pAltVars;
-extern BOOLEAN  pSRING;
-#endif
-#ifdef SDRING
-void   psAug(poly q, poly done, polyset *s, int *l, int *m);
-void   pdAug(poly q, polyset *s, int *l, int *m);
-#endif
-#ifdef SDRING
-extern BOOLEAN pSDRING;
-#endif
-
 /* function prototypes */
 
@@ -121 +83 @@
 BOOLEAN   pHasNotCF(poly p1, poly p2);   /*has no common factor ?*/
 void      pSplit(poly p, poly * r);   /*p => IN(p), r => REST(p) */
+// Returns TRUE if m is monom of p, FALSE otherwise
+BOOLEAN pIsMonomOf(poly p, poly m);
 
 
@@ -349 +313 @@
 // This is something weird -- Don't use it, unless you know what you are doing
 poly      pTakeOutComp(poly * p, int k);
+void      pSetPolyComp(poly p, int comp);
 void      pDeleteComp(poly * p,int k);
 void      pNorm(poly p);
@@ -375 +340 @@
 // tests (see polys-impl.cc )
 unsigned long pGetShortExpVector(poly p);
+
+
 
 

Singular/polys0.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys0.cc,v 1.11 1999-09-27 15:05:31 obachman Exp $ */
+/* $Id: polys0.cc,v 1.12 1999-09-29 10:59:37 obachman Exp $ */
 
 /*
@@ -35 +35 @@
     && (!nIsMOne(pGetCoeff(p)))
   )
-#ifdef DRING
-  || (pDRING && pdIsConstantComp(p))
-#endif
   )
   {
@@ -59 +56 @@
   for (i=0; i<pVariables; i++)
   {
-#ifdef DRING
-    if ((!pDRING)||(i!=2*pdN))
-#endif
     {
       Exponent_t ee = pGetExp(p,i+1);
@@ -71 +65 @@
           wroteCoef=(pShortOut==0);
         writeGen=TRUE;
-#ifdef DRING
-        if((pDRING)&&(pdN<=i)&&(i<2*pdN)&&(pdDFlag(p)==0))
-        {
-          StringAppendS(RingVar(i-pdN));
-          ee=-ee;
-        }
-        else
-          StringAppendS(RingVar(i));
-#else
         StringAppendS(RingVar(i));
-#endif
         if (ee != 1)
         {

Singular/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.28 1999-09-28 15:02:33 obachman Exp $ */
+/* $Id: polys1.cc,v 1.29 1999-09-29 10:59:38 obachman Exp $ */
 
 /*
@@ -77 +77 @@
   }
   return k;
+}
+
+BOOLEAN pIsMonomOf(poly p, poly m)
+{
+  if (m == NULL) return TRUE;
+  while (p != NULL)
+  {
+    if (p == m) return TRUE;
+    pIter(p);
+  }
+  return FALSE;
 }
 
@@ -478 +489 @@
           }
         }
-#ifdef SDRING
-        if(pSDRING)
-        {
-          return pPow(p,i);
-        }
-        else
-#endif
         {
           rc = pNext(p);

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.65 1999-09-27 14:39:25 obachman Exp $ */
+/* $Id: ring.cc,v 1.66 1999-09-29 10:59:38 obachman Exp $ */
 
 /*
@@ -22 +22 @@
 #include "longalg.h"
 #include "ffields.h"
-#include "spolys.h"
 #include "subexpr.h"
 #include "ideals.h"
@@ -53 +52 @@
 // complete == FALSE : only delete operations are enabled
 // complete == TRUE  : full reset of all variables
-#ifdef DRING
-void rChangeCurrRing(ring r, BOOLEAN complete, idhdl h)
-#else
 void rChangeCurrRing(ring r, BOOLEAN complete)
-#endif
 {
   /*------------ set global ring vars --------------------------------*/
@@ -89 +84 @@
       }
 
-#ifdef DRING
-      pDRING=FALSE;
-      pSDRING=FALSE;
-      if ((h!=NULL) && (hasFlag(h,FLAG_DRING))) rDSet();
-#endif // DRING
-
-#ifdef SRING
-      if ((currRing->partN<=currRing->N)
-#ifdef DRING
-          && ((h==NULL) || (!hasFlag(h,FLAG_DRING)))
-#endif
-          )
-      {
-        pAltVars=currRing->partN;
-        pSRING=TRUE;
-        pSDRING=TRUE;
-      }
-      else
-      {
-        pAltVars=currRing->N+1;
-      }
-#endif // SRING
-
     /*------------ set spolys ------------------------------------------*/
-      spSet(r);
     }
   }
@@ -140 +111 @@
 
    /*------------ change the global ring -----------------------*/
-  #ifdef DRING
-  rChangeCurrRing(rg,complete,h);
-  #else
   rChangeCurrRing(rg,complete);
-  #endif
   currRingHdl = h;
 
@@ -206 +173 @@
   r->N     = 3;
   /*r->P     = 0; Alloc0 in idhdl::set, ipid.cc*/
-#ifdef SRING
-  r->partN = 4;
-#endif
   /*names*/
   r->names = (char **) Alloc(3 * sizeof(char *));
@@ -650 +614 @@
  s: name, chr: ch, varnames: rv, ordering: ord, typ: typ
  */
-#ifdef DRING
-void rDSet()
-{
-  pDRING=TRUE;
-  pSDRING=TRUE;
-  pdN=currRing->partN;
-  pdK=pVariables-pdN*2-1;
-}
-#endif
 
 int rIsRingVar(char *n)
@@ -2409 +2364 @@
   r->ExpLSize=j/(sizeof(long)/sizeof(Exponent_t));
   r->mm_specHeap = mmGetSpecHeap(POLYSIZE + (r->ExpLSize)*sizeof(long));
+  if (r->mm_specHeap == NULL)
+  {
+    // monomial too large, clean up
+    Free((ADDRESS)tmp_ordsgn,(2*(n+r->N)*sizeof(long)));
+    Free((ADDRESS)tmp_typ,(2*(n+r->N)*sizeof(sro_ord)));
+    Free((ADDRESS)v,(r->N+1)*sizeof(int));
+    return TRUE;
+  }
+  
 
   // ----------------------------

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.33 1999-09-27 14:39:26 obachman Exp $ */
+/* $Id: ring.h,v 1.34 1999-09-29 10:59:39 obachman Exp $ */
 
 /* includes */
@@ -16 +16 @@
 
 
-#ifdef DRING
-void   rChangeCurrRing(ring r, BOOLEAN complete = TRUE, idhdl h = NULL);
-#else
 void   rChangeCurrRing(ring r, BOOLEAN complete = TRUE);
-#endif
 void   rSetHdl(idhdl h, BOOLEAN complete = TRUE);
 idhdl  rInit(char *s, sleftv* pn, sleftv* rv, sleftv* ord);
@@ -51 +47 @@
 
 idhdl  rFindHdl(ring r, idhdl n, idhdl w);
-#ifdef DRING
-void rDSet();
-#endif
 void   rDInit();
 int rOrderName(char * ordername);

Singular/spSpolyLoop.inc

@@ -1 @@
-typedef enum Characteristics {chGEN = 0, chMODP} Characteristics;
-typedef enum OrderingTypes {otGEN = 0, otEXP, otCOMPEXP, otEXPCOMP} OrderingTypes;
-typedef enum Homogs {homGEN = 0, homYES} Homogs;
-typedef enum NumWords {nwGEN = 0, nwONE, nwTWO, nwEVEN, nwODD} NumWords;
-static void spSpolyLoop_chMODP_otCOMPEXP_homGEN_nwEVEN
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  ;              // inits order for homog case
-  
-
-  pCopyAddFast0(b, a1, monom);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetComp(a2) - pGetComp(b);
-    NonZeroTestA(d, pComponentOrder, goto NotEqual);
-    d = pGetOrder(b) - pGetOrder(a2);
-    NonZeroTestA(d, pOrdSgn, goto NotEqual);
-    _pMonComp_otEXP_nwEVEN(b, a2, pVariables1W, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFast0(b, a1, monom); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFast0(b, a1, monom); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otCOMPEXP_homGEN_nwODD
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  ;              // inits order for homog case
-  
-
-  pCopyAddFast0(b, a1, monom);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetComp(a2) - pGetComp(b);
-    NonZeroTestA(d, pComponentOrder, goto NotEqual);
-    d = pGetOrder(b) - pGetOrder(a2);
-    NonZeroTestA(d, pOrdSgn, goto NotEqual);
-    _pMonComp_otEXP_nwODD(b, a2, pVariables1W, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFast0(b, a1, monom); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFast0(b, a1, monom); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otCOMPEXP_homGEN_nwONE
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  ;              // inits order for homog case
-  
-
-  pCopyAddFast0(b, a1, monom);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetComp(a2) - pGetComp(b);
-    NonZeroTestA(d, pComponentOrder, goto NotEqual);
-    d = pGetOrder(b) - pGetOrder(a2);
-    NonZeroTestA(d, pOrdSgn, goto NotEqual);
-    _pMonComp_otEXP_nwONE(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFast0(b, a1, monom); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFast0(b, a1, monom); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otCOMPEXP_homGEN_nwTWO
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  ;              // inits order for homog case
-  
-
-  pCopyAddFast0(b, a1, monom);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetComp(a2) - pGetComp(b);
-    NonZeroTestA(d, pComponentOrder, goto NotEqual);
-    d = pGetOrder(b) - pGetOrder(a2);
-    NonZeroTestA(d, pOrdSgn, goto NotEqual);
-    _pMonComp_otEXP_nwTWO(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFast0(b, a1, monom); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFast0(b, a1, monom); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otCOMPEXP_homYES_nwEVEN
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  order = pGetOrder(a2);              // inits order for homog case
-  
-
-  pCopyAddFastHomog(b, a1, monom, order);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetComp(a2) - pGetComp(b);
-    NonZeroTestA(d, pComponentOrder, goto NotEqual);
-    _pMonComp_otEXP_nwEVEN(b, a2, pVariables1W, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFastHomog(b, a1, monom, order); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFastHomog(b, a1, monom, order); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otCOMPEXP_homYES_nwODD
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  order = pGetOrder(a2);              // inits order for homog case
-  
-
-  pCopyAddFastHomog(b, a1, monom, order);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetComp(a2) - pGetComp(b);
-    NonZeroTestA(d, pComponentOrder, goto NotEqual);
-    _pMonComp_otEXP_nwODD(b, a2, pVariables1W, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFastHomog(b, a1, monom, order); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFastHomog(b, a1, monom, order); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otCOMPEXP_homYES_nwONE
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  order = pGetOrder(a2);              // inits order for homog case
-  
-
-  pCopyAddFastHomog(b, a1, monom, order);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetComp(a2) - pGetComp(b);
-    NonZeroTestA(d, pComponentOrder, goto NotEqual);
-    _pMonComp_otEXP_nwONE(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFastHomog(b, a1, monom, order); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFastHomog(b, a1, monom, order); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otCOMPEXP_homYES_nwTWO
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  order = pGetOrder(a2);              // inits order for homog case
-  
-
-  pCopyAddFastHomog(b, a1, monom, order);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetComp(a2) - pGetComp(b);
-    NonZeroTestA(d, pComponentOrder, goto NotEqual);
-    _pMonComp_otEXP_nwTWO(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFastHomog(b, a1, monom, order); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFastHomog(b, a1, monom, order); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXPCOMP_homGEN_nwEVEN
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  ;              // inits order for homog case
-  
-
-  pCopyAddFast0(b, a1, monom);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetOrder(b) - pGetOrder(a2);
-    NonZeroTestA(d, pOrdSgn, goto NotEqual);
-    _pMonComp_otEXPCOMP_nwEVEN(b, a2, pVariables1W, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFast0(b, a1, monom); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFast0(b, a1, monom); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXPCOMP_homGEN_nwODD
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  ;              // inits order for homog case
-  
-
-  pCopyAddFast0(b, a1, monom);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetOrder(b) - pGetOrder(a2);
-    NonZeroTestA(d, pOrdSgn, goto NotEqual);
-    _pMonComp_otEXPCOMP_nwODD(b, a2, pVariables1W, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFast0(b, a1, monom); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFast0(b, a1, monom); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXPCOMP_homGEN_nwONE
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  ;              // inits order for homog case
-  
-
-  pCopyAddFast0(b, a1, monom);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetOrder(b) - pGetOrder(a2);
-    NonZeroTestA(d, pOrdSgn, goto NotEqual);
-    _pMonComp_otEXPCOMP_nwONE(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFast0(b, a1, monom); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFast0(b, a1, monom); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXPCOMP_homGEN_nwTWO
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  ;              // inits order for homog case
-  
-
-  pCopyAddFast0(b, a1, monom);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetOrder(b) - pGetOrder(a2);
-    NonZeroTestA(d, pOrdSgn, goto NotEqual);
-    _pMonComp_otEXPCOMP_nwTWO(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFast0(b, a1, monom); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFast0(b, a1, monom); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXPCOMP_homYES_nwEVEN
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  order = pGetOrder(a2);              // inits order for homog case
-  
-
-  pCopyAddFastHomog(b, a1, monom, order);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    _pMonComp_otEXPCOMP_nwEVEN(b, a2, pVariables1W, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFastHomog(b, a1, monom, order); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFastHomog(b, a1, monom, order); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXPCOMP_homYES_nwODD
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  order = pGetOrder(a2);              // inits order for homog case
-  
-
-  pCopyAddFastHomog(b, a1, monom, order);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    _pMonComp_otEXPCOMP_nwODD(b, a2, pVariables1W, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFastHomog(b, a1, monom, order); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFastHomog(b, a1, monom, order); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXPCOMP_homYES_nwONE
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  order = pGetOrder(a2);              // inits order for homog case
-  
-
-  pCopyAddFastHomog(b, a1, monom, order);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    _pMonComp_otEXPCOMP_nwONE(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFastHomog(b, a1, monom, order); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFastHomog(b, a1, monom, order); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXPCOMP_homYES_nwTWO
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  order = pGetOrder(a2);              // inits order for homog case
-  
-
-  pCopyAddFastHomog(b, a1, monom, order);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    _pMonComp_otEXPCOMP_nwTWO(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFastHomog(b, a1, monom, order); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFastHomog(b, a1, monom, order); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXP_homGEN_nwEVEN
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  ;              // inits order for homog case
-  
-
-  pCopyAddFast0(b, a1, monom);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetOrder(b) - pGetOrder(a2);
-    NonZeroTestA(d, pOrdSgn, goto NotEqual);
-    _pMonComp_otEXP_nwEVEN(b, a2, pVariables1W, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFast0(b, a1, monom); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFast0(b, a1, monom); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXP_homGEN_nwODD
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  ;              // inits order for homog case
-  
-
-  pCopyAddFast0(b, a1, monom);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetOrder(b) - pGetOrder(a2);
-    NonZeroTestA(d, pOrdSgn, goto NotEqual);
-    _pMonComp_otEXP_nwODD(b, a2, pVariables1W, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFast0(b, a1, monom); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFast0(b, a1, monom); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXP_homGEN_nwONE
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  ;              // inits order for homog case
-  
-
-  pCopyAddFast0(b, a1, monom);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetOrder(b) - pGetOrder(a2);
-    NonZeroTestA(d, pOrdSgn, goto NotEqual);
-    _pMonComp_otEXP_nwONE(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFast0(b, a1, monom); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFast0(b, a1, monom); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXP_homGEN_nwTWO
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  ;              // inits order for homog case
-  
-
-  pCopyAddFast0(b, a1, monom);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    d = pGetOrder(b) - pGetOrder(a2);
-    NonZeroTestA(d, pOrdSgn, goto NotEqual);
-    _pMonComp_otEXP_nwTWO(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFast0(b, a1, monom); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFast0(b, a1, monom); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXP_homYES_nwEVEN
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  order = pGetOrder(a2);              // inits order for homog case
-  
-
-  pCopyAddFastHomog(b, a1, monom, order);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    _pMonComp_otEXP_nwEVEN(b, a2, pVariables1W, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFastHomog(b, a1, monom, order); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFastHomog(b, a1, monom, order); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXP_homYES_nwODD
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  order = pGetOrder(a2);              // inits order for homog case
-  
-
-  pCopyAddFastHomog(b, a1, monom, order);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    _pMonComp_otEXP_nwODD(b, a2, pVariables1W, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFastHomog(b, a1, monom, order); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFastHomog(b, a1, monom, order); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXP_homYES_nwONE
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  order = pGetOrder(a2);              // inits order for homog case
-  
-
-  pCopyAddFastHomog(b, a1, monom, order);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    _pMonComp_otEXP_nwONE(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFastHomog(b, a1, monom, order); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFastHomog(b, a1, monom, order); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static void spSpolyLoop_chMODP_otEXP_homYES_nwTWO
-(poly a1, poly a2, poly monom, poly spNoether)
-{ 
-  poly a = monom,                         // collects the result
-       b = NULL,                          // stores a1*monom
-       c;                                 // used for temporary storage
-  number tm   = pGetCoeff(monom),         // coefficient of monom
-         tneg = npNegM(tm),        // - (coefficient of monom)
-         tb,                              // used for tm*coeff(a1)
-         tc;                              // used for intermediate coeff
-
-  Order_t order;                          // used for homog case
-
-  if (a2==NULL) goto Finish;              // we are done if a2 is 0
-  b = pNew();   
-
-  order = pGetOrder(a2);              // inits order for homog case
-  
-
-  pCopyAddFastHomog(b, a1, monom, order);  // now a2 != NULL -- set up b
-
-  // MAIN LOOP:
-  Top:     // compare b = monom*a1 and a2 w.r.t. monomial ordering
-    register long d;
-    _pMonComp_otEXP_nwTWO(b, a2, d, NonZeroA(d, pLexSgn, goto NotEqual ), goto Equal);;
-
-  Equal:   // b equals a2
-    assume(pComp0(b, a2) == 0);
-    tb = npMultM(pGetCoeff(a1), tm);
-    tc = pGetCoeff(a2);
-    if (!npEqualM(tc, tb))
-    {
-      tc=npSubM(tc, tb);
-      ;
-      pSetCoeff0(a2,tc); // adjust coeff of a2
-      a = pNext(a) = a2; // append a2 to result and advance a2
-      pIter(a2);
-    }
-    else
-    { // coeffs are equal, so their difference is 0: 
-      c = a2;  // do not append anything to result: Delete a2 and advance
-      pIter(a2);
-      ;
-      pFree1(c);
-    }
-    ;
-    pIter(a1);
-    if (a2 == NULL || a1 == NULL) goto Finish; // are we done ?
-    pCopyAddFastHomog(b, a1, monom, order); // No! So, get new b = a1*monom
-    goto Top;
-
-  NotEqual:     // b != a2 
-    if (d < 0)  // b < a2: 
-    {
-      assume(pComp0(b, a2) == -1);
-      a = pNext(a) = a2;// append a2 to result and advance a2
-      pIter(a2);
-      if (a2==NULL) goto Finish;;
-      goto Top;
-    }
-    else // now d >= 0, i.e., b > a2
-    {
-      assume(pComp0(b, a2) == 1);
-      pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
-      a = pNext(a) = b;       // append b to result and advance a1
-      pIter(a1);
-      if (a1 == NULL)         // are we done?
-      {
-        b = pNew();
-        goto Finish; 
-      }
-      b = pNew();
-      pCopyAddFastHomog(b, a1, monom, order); // No! So, update b = a1*monom
-      goto Top;
-    }
- 
- Finish: // a1 or a2 is NULL: Clean-up time
-   assume(a1 == NULL || a2 == NULL);
-   if (a1 == NULL) // append rest of a2 to result
-     pNext(a) = a2;
-   else  // append (- a1*monom) to result 
-     spMultCopyX(a1, monom, a, tneg, spNoether);
-   ;
-   if (b != NULL) pFree1(b);
-} 
-static spSpolyLoopProc spGetSpolyLoop(Characteristics ch,OrderingTypes ot,Homogs hom,NumWords nw)
-{
-if (ch == chMODP)
-{
-if (ot == otEXP)
-{
-if (hom == homYES)
-{
-if (nw == nwTWO)
-{
-return spSpolyLoop_chMODP_otEXP_homYES_nwTWO;
-}
-if (nw == nwONE)
-{
-return spSpolyLoop_chMODP_otEXP_homYES_nwONE;
-}
-if (nw == nwODD)
-{
-return spSpolyLoop_chMODP_otEXP_homYES_nwODD;
-}
-if (nw == nwEVEN)
-{
-return spSpolyLoop_chMODP_otEXP_homYES_nwEVEN;
-}
-}
-if (nw == nwTWO)
-{
-return spSpolyLoop_chMODP_otEXP_homGEN_nwTWO;
-}
-if (nw == nwONE)
-{
-return spSpolyLoop_chMODP_otEXP_homGEN_nwONE;
-}
-if (nw == nwODD)
-{
-return spSpolyLoop_chMODP_otEXP_homGEN_nwODD;
-}
-if (nw == nwEVEN)
-{
-return spSpolyLoop_chMODP_otEXP_homGEN_nwEVEN;
-}
-}
-if (ot == otEXPCOMP)
-{
-if (hom == homYES)
-{
-if (nw == nwTWO)
-{
-return spSpolyLoop_chMODP_otEXPCOMP_homYES_nwTWO;
-}
-if (nw == nwONE)
-{
-return spSpolyLoop_chMODP_otEXPCOMP_homYES_nwONE;
-}
-if (nw == nwODD)
-{
-return spSpolyLoop_chMODP_otEXPCOMP_homYES_nwODD;
-}
-if (nw == nwEVEN)
-{
-return spSpolyLoop_chMODP_otEXPCOMP_homYES_nwEVEN;
-}
-}
-if (nw == nwTWO)
-{
-return spSpolyLoop_chMODP_otEXPCOMP_homGEN_nwTWO;
-}
-if (nw == nwONE)
-{
-return spSpolyLoop_chMODP_otEXPCOMP_homGEN_nwONE;
-}
-if (nw == nwODD)
-{
-return spSpolyLoop_chMODP_otEXPCOMP_homGEN_nwODD;
-}
-if (nw == nwEVEN)
-{
-return spSpolyLoop_chMODP_otEXPCOMP_homGEN_nwEVEN;
-}
-}
-if (ot == otCOMPEXP)
-{
-if (hom == homYES)
-{
-if (nw == nwTWO)
-{
-return spSpolyLoop_chMODP_otCOMPEXP_homYES_nwTWO;
-}
-if (nw == nwONE)
-{
-return spSpolyLoop_chMODP_otCOMPEXP_homYES_nwONE;
-}
-if (nw == nwODD)
-{
-return spSpolyLoop_chMODP_otCOMPEXP_homYES_nwODD;
-}
-if (nw == nwEVEN)
-{
-return spSpolyLoop_chMODP_otCOMPEXP_homYES_nwEVEN;
-}
-}
-if (nw == nwTWO)
-{
-return spSpolyLoop_chMODP_otCOMPEXP_homGEN_nwTWO;
-}
-if (nw == nwONE)
-{
-return spSpolyLoop_chMODP_otCOMPEXP_homGEN_nwONE;
-}
-if (nw == nwODD)
-{
-return spSpolyLoop_chMODP_otCOMPEXP_homGEN_nwODD;
-}
-if (nw == nwEVEN)
-{
-return spSpolyLoop_chMODP_otCOMPEXP_homGEN_nwEVEN;
-}
-}
-}
-return NULL;
-}

Singular/spolys.h

@@ -7 +7 @@
 * ABSTRACT: s-polynomials
 */
-/* $Id: spolys.h,v 1.7 1999-09-27 14:43:43 obachman Exp $ */
+/* $Id: spolys.h,v 1.8 1999-09-29 10:59:40 obachman Exp $ */
 #include "structs.h"
-#include "spSpolyLoop.h"
 
 /* reduction */

Singular/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.24 1999-09-28 17:37:22 Singular Exp $ */
+/* $Id: structs.h,v 1.25 1999-09-29 10:59:40 obachman Exp $ */
 /*
 * ABSTRACT
@@ -215 +215 @@
 
   memHeap   mm_specHeap; /* Heap from where monoms are allocated */
-#ifdef SDRING
-  short      partN;
-#endif
   short      ch;     /* characteristic */
   short      ch_flags; /* additional char-flags */

Singular/syz.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz.cc,v 1.22 1999-09-27 15:32:56 obachman Exp $ */
+/* $Id: syz.cc,v 1.23 1999-09-29 10:59:40 obachman Exp $ */
 
 /*
@@ -16 +16 @@
 #include "kstd1.h"
 #include "kutil.h"
-#include "spolys.h"
 #include "stairc.h"
-//#include "ipid.h"
 #include "cntrlc.h"
 #include "ipid.h"

Singular/syz.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz.h,v 1.17 1999-09-27 15:05:33 obachman Exp $ */
+/* $Id: syz.h,v 1.18 1999-09-29 10:59:41 obachman Exp $ */
 /*
 * ABSTRACT: Resolutions
 */
 #include "structs.h"
-#include "kbPolyProcs.h"
 
 struct sSObject{
@@ -50 +49 @@
   kBucket_pt syz_bucket;
   ring syRing;
-  kbPolyProcs pProcs;
   int length;
   resolvente fullres;

Singular/syz0.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz0.cc,v 1.20 1999-09-27 15:32:56 obachman Exp $ */
+/* $Id: syz0.cc,v 1.21 1999-09-29 10:59:41 obachman Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -12 +12 @@
 #include "mmemory.h"
 #include "polys.h"
-#include "spolys.h"
 #include "febase.h"
 #include "kstd1.h"
 #include "kutil.h"
-#include "spolys.h"
 #include "stairc.h"
 #include "ipid.h"
@@ -31 +29 @@
 
 static kBucket_pt sy0buck;
-static kbPolyProcs sy0pProcs;
 
 static polyset syInitSort(polyset oldF,int rkF,int Fmax,
@@ -125 +122 @@
 }
 
-static poly syRedtail2(poly p, polyset redWith, intvec *modcomp, spSpolyLoopProc SpolyLoop = NULL)
+static poly syRedtail2(poly p, polyset redWith, intvec *modcomp)
 {
   poly h, hn;
@@ -143 +140 @@
       {
         //if (TEST_OPT_PROT) Print("r");
-        hn = spSpolyRed(redWith[j],hn,NULL, SpolyLoop);
+        hn = ksOldSpolyRed(redWith[j],hn);
         if (hn == NULL)
         {
@@ -202 +199 @@
   rkF=idRankFreeModule(idF);
   Free((ADDRESS)idF,sizeof(ip_sideal));
-  spSet(currRing);
 /*-------------sorting of F for index handling------------*/
   if (noSort)
@@ -286 +282 @@
         tl = smax;
 /*--------------begin to reduce-----------------------------*/
-        toRed = spSpolyCreate(S[j],S[k],NULL, NULL);
+        toRed = ksOldCreateSpoly(S[j],S[k]);
         ecartToRed = 1;
         bestEcart = 1;
@@ -383 +379 @@
             }
 
-            toRed = spSpolyRed(p,toRed,NULL, NULL);
+            toRed = ksOldSpolyRed(p,toRed);
           }
         }
@@ -433 +429 @@
 *special Normalform for Schreyer in factor rings
 */
-poly sySpecNormalize(poly toNorm,ideal mW=NULL, spSpolyLoopProc SpolyLoop=NULL)
+poly sySpecNormalize(poly toNorm,ideal mW=NULL)
 {
   int j,i=0;
@@ -450 +446 @@
     {
       //pNorm(toNorm);
-      toNorm = spSpolyRed(currQuotient->m[i],toNorm,NULL, SpolyLoop);
+      toNorm = ksOldSpolyRed(currQuotient->m[i],toNorm);
       pDelete(&p);
       if (toNorm==NULL) return NULL;
@@ -550 +546 @@
         {
           number an=nCopy(pGetCoeff(F[k])),bn=nCopy(pGetCoeff(F[j]));
-          int ct = spCheckCoeff(&an, &bn);
+          int ct = ksCheckCoeff(&an, &bn);
           syz = pCopy(pairs[k]);
           //syz->coef = nCopy(F[k]->coef);
@@ -587 +583 @@
         }
         if (k<Fl)
-          toRed = spSpolyCreate(F[j],F[k],NULL, NULL);
+          toRed = ksOldCreateSpoly(F[j],F[k]);
         else
         {
           q = pMultT(pCopy(F[j]),multWith);
-          toRed = sySpecNormalize(q,mW, NULL);
+          toRed = sySpecNormalize(q,mW);
           pDelete(&multWith);
         }
@@ -614 +610 @@
           printf("toRed in Pair[%d, %d]:", j, k);
           pWrite(toRed);
-          kBucketInit(sy0buck,toRed,-1,&sy0pProcs);
+          kBucketInit(sy0buck,toRed,-1);
 #endif
 
@@ -622 +618 @@
             {
               kBucketClear(sy0buck,&toRed,&ltR);
-              toRed = sySpecNormalize(toRed,mW, NULL);
+              toRed = sySpecNormalize(toRed,mW);
 #ifdef WRITE_BUCKETS
               printf("toRed in Pair[%d, %d]:", j, k);
@@ -691 +687 @@
           {
             (*newmodcomp)[j+2] = Sl;
-            (*Shdl)[Sl] = syRedtail2(syz,*Shdl,newmodcomp, NULL);
+            (*Shdl)[Sl] = syRedtail2(syz,*Shdl,newmodcomp);
             (*newmodcomp)[j+2] = 0;
           }
@@ -844 +840 @@
     //while ((i!=0) && (!res[syzIndex]->m[i-1])) i--;
     sy0buck = kBucketCreate();
-    kbSetPolyProcs(&sy0pProcs,currRing,spGetOrderType(currRing,1,0));
     if (syzIndex+1==*length)
     {

Singular/syz1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz1.cc,v 1.40 1999-09-27 15:05:33 obachman Exp $ */
+/* $Id: syz1.cc,v 1.41 1999-09-29 10:59:41 obachman Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -14 +14 @@
 #include "kstd1.h"
 #include "kutil.h"
-#include "spolys.h"
-#include "spolys0.h"
 #include "stairc.h"
 #include "ipid.h"
@@ -31 +29 @@
 #include "syz.h"
 #include "kbuckets.h"
-#include "kbPolyProcs.h"
 #include <limits.h>
 
@@ -38 +35 @@
 /*--------------static variables------------------------*/
 /*---points to the real components, shifted of the actual module-*/
-static int *  currcomponents=NULL;
-static long *  currShiftedComponents=NULL;
+int *  currcomponents=NULL;
+long *  currShiftedComponents=NULL;
 
 // Logarithm of estimate of maximal number of new components
@@ -374 +371 @@
         {
           //hn = sySPolyRed(hn,redWith->m[j]);
-          hn = spSpolyRed(redWith->m[j],hn,NULL,spSpolyLoop_General);
+          hn = ksOldSpolyRed(redWith->m[j],hn);
           if (hn == NULL)
           {
@@ -805 +802 @@
       pTest(tso.p1);
       nextPairs[i].p =
-        spSpolyCreate(tso.p2, tso.p1,NULL,spSpolyLoop_General);
+        ksOldCreateSpoly(tso.p2, tso.p1,NULL);
       (*spl)[i] = pLength(nextPairs[i].p);
     }
@@ -1046 +1043 @@
         {
           (sPairs)[i].syz =
-            spSpolyRed(res->m[j],(sPairs)[i].syz,NULL,spSpolyLoop_General);
+            ksOldSpolyRed(res->m[j],(sPairs)[i].syz);
             //sySPolyRed((sPairs)[i].syz,res->m[j]);
           j = k-1;
@@ -1535 +1532 @@
 static void syStatistics(resolvente res,int length)
 {
-  int i,j=1,k,deg=0;
+  int i,j=1,k;
+  Order_t deg = 0;
 
   PrintLn();
@@ -2518 +2516 @@
   pComp0 = syzcomp2dpc;
   syzstr->bucket = kBucketCreate();
-  kbSetPolyProcs(&syzstr->pProcs,currRing,rOrderType_Syz2dpc,FALSE);
   for (index=syzstr->length-1;index>0;index--)
   {
@@ -2714 +2711 @@
   syzstr->Firstelem = (int**)Alloc0((*length+1)*sizeof(int*));
   syzstr->bucket = kBucketCreate();
-  kbSetPolyProcs(&syzstr->pProcs,currRing,rOrderType_Syz2dpc,FALSE);
   int len0=idRankFreeModule(arg)+1;
   startdeg = actdeg;

Singular/syz2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz2.cc,v 1.1 1999-09-27 15:05:34 obachman Exp $ */
+/* $Id: syz2.cc,v 1.2 1999-09-29 10:59:42 obachman Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -605 +605 @@
     {
       //tso.p = sySPoly(tso.p1, tso.p2,tso.lcm);
-      tso.p = spSpolyCreate(tso.p2, tso.p1,NULL,spSpolyLoop_General);
+      tso.p = ksOldCreateSpoly(tso.p2, tso.p1);
 #ifdef SHOW_PROT
 Print("reduziere Paar mit: \n");
@@ -966 +966 @@
   syzstr->bucket = kBucketCreate();
   syzstr->syz_bucket = kBucketCreate();
-  kbSetPolyProcs(&syzstr->pProcs,currRing,rOrderType_Syz2dpc,FALSE);
   startdeg = actdeg;
   nextPairs = syChosePairs(syzstr,&index,&howmuch,&actdeg);

Singular/tesths.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tesths.cc,v 1.75 1999-09-24 12:24:41 Singular Exp $ */
+/* $Id: tesths.cc,v 1.76 1999-09-29 10:59:43 obachman Exp $ */
 
 /*
@@ -122 +122 @@
 "                                                       0<\n"
 "     by: G.-M. Greuel, G. Pfister, H. Schoenemann        \\   %s\n"
-#ifdef SDRING
-"       preliminary experimental version\n"
-#endif
 "FB Mathematik der Universitaet, D-67653 Kaiserslautern    \\\n"
 , S_VERSION1,S_VERSION2);