Changeset c3c413 in git

Timestamp:

Jun 9, 1997, 2:21:29 PM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91e5db82acc17434e4062bcfa44e6efa7d41fd30')

Children:

74f19d94b7f4d611715804cf278d0652970e4e90

Parents:

e8a30d706fbfe3265065f965770b3285a7e817b1

Message:

* hannes/siebert: minor bug fixes in k*.cc, syz1.cc
   added degBound to sres


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

Location:

Singular

Files:

• kstd1.cc (modified) (7 diffs)
• kstd2.cc (modified) (8 diffs)
• kstdfac.cc (modified) (3 diffs)
• kutil.cc (modified) (3 diffs)
• syz1.cc (modified) (2 diffs)

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.6 1997-05-20 08:52:08 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.7 1997-06-09 12:21:24 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -134 +134 @@
     if (pDivisibleBy(strat->T[j].p,(*h).p))
     {
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       if (TEST_OPT_DEBUG) PrintS("+");
       /*- compute the s-polynomial -*/
@@ -260 +260 @@
     if (pDivisibleBy(strat->T[j].p,(*h).p))
     {
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       if (TEST_OPT_DEBUG) PrintS("+");
       /*- compute the s-polynomial -*/
@@ -429 +429 @@
     if (pDivisibleBy(strat->T[j].p,(*h).p))
     {
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       if (TEST_OPT_DEBUG) PrintS("+\n");
       /*
@@ -532 +532 @@
     if (pDivisibleBy(strat->T[j].p,(*h).p))
     {
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       if (TEST_OPT_DEBUG) PrintS("+");
       /*- compute the s-polynomial -*/
@@ -706 +706 @@
     if (pDivisibleBy(strat->T[j].p,H.p))
     {
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       if (TEST_OPT_DEBUG) PrintS("+");
       /*- remember the found T-poly -*/
@@ -1325 +1325 @@
   {
     if (lrmax< strat->Ll) lrmax=strat->Ll; /*stat*/
-    test_int_std(strat->kIdeal);
+    //test_int_std(strat->kIdeal);
     if (TEST_OPT_DEBUG) messageSets(strat);
     if (TEST_OPT_DEGBOUND

Singular/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.4 1997-06-04 19:45:20 obachman Exp $ */
+/* $Id: kstd2.cc,v 1.5 1997-06-09 12:21:25 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -117 +117 @@
         }
       }
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       /*- compute the s-polynomial -*/
       (*h).p = spSpolyRed(strat->S[j],(*h).p,strat->kNoether);
@@ -204 +204 @@
         wrp(strat->S[j]);
       }
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       /*- compute the s-polynomial -*/
       (*h).p = spSpolyRed(strat->S[j],(*h).p,strat->kNoether);
@@ -267 +267 @@
     if (pDivisibleBy(strat->T[j].p,(*h).p))
     {
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       if (TEST_OPT_DEBUG)
       {
@@ -347 +347 @@
     if (pDivisibleBy(strat->S[j],(*h).p))
     {
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       if (TEST_OPT_DEBUG)
       {
@@ -644 +644 @@
     if (pDivisibleBy(strat->T[j].p,(*h).p))
     {
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       /* compute the s-polynomial */
       if (!TEST_OPT_INTSTRATEGY) pNorm((*h).p);
@@ -797 +797 @@
     if (pDivisibleBy(strat->S[j],h))
     {
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       /*- compute the s-polynomial -*/
       if (TEST_OPT_DEBUG)
@@ -912 +912 @@
     if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
     if (TEST_OPT_DEBUG) messageSets(strat);
-    test_int_std(strat->kIdeal);
+    //test_int_std(strat->kIdeal);
     if (strat->Ll== 0) strat->interpt=TRUE;
     if (TEST_OPT_DEGBOUND

Singular/kstdfac.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstdfac.cc,v 1.5 1997-04-25 15:04:01 obachman Exp $ */
+/* $Id: kstdfac.cc,v 1.6 1997-06-09 12:21:26 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: factorizing alg. of Buchberger
@@ -224 +224 @@
   for (si=strat->sl; si>0; si--)
   {
-    if (strat->interpt) test_int_std(strat->kIdeal);
+    //if (strat->interpt) test_int_std(strat->kIdeal);
     strat->S[si] = redtailBba(strat->S[si],si-1,strat);
     if (TEST_OPT_INTSTRATEGY)
@@ -427 +427 @@
     if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
     if (TEST_OPT_DEBUG) messageSets(strat);
-    test_int_std(strat->kIdeal);
+    //test_int_std(strat->kIdeal);
     if (strat->Ll== 0) strat->interpt=TRUE;
     if (TEST_OPT_DEGBOUND

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.5 1997-05-21 13:05:13 obachman Exp $ */
+/* $Id: kutil.cc,v 1.6 1997-06-09 12:21:27 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for std
@@ -3545 +3545 @@
     for (i=strat->sl; i>0; i--)
     {
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       strat->S[i] = redtailBba(strat->S[i],i-1,strat);
       if (TEST_OPT_INTSTRATEGY)
@@ -3561 +3561 @@
     for (i=strat->sl; i>=0; i--)
     {
-      if (strat->interpt) test_int_std(strat->kIdeal);
+      //if (strat->interpt) test_int_std(strat->kIdeal);
       strat->S[i] = redtail(strat->S[i],strat->sl,strat);
       if (TEST_OPT_INTSTRATEGY)

Singular/syz1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz1.cc,v 1.7 1997-05-18 11:13:14 Singular Exp $ */
+/* $Id: syz1.cc,v 1.8 1997-06-09 12:21:29 Singular Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -1753 +1753 @@
     (*index)++;
   }
+  if (TEST_OPT_DEGBOUND && (newdeg > Kstd1_deg))
+    return NULL;
   if (newdeg>*actdeg)
   {