Changeset 07b1cf in git

Timestamp:

Feb 1, 2007, 7:53:54 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

add114ed9eca28cf67e9f12e3e5a60d07696ce8a

Parents:

2cd0ca7c81f7d71ae3b530712b2d135a4df1802e

Message:

*hannes: OPT_SB_1


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

Location:

kernel

Files:

• gr_kstd2.cc (modified) (3 diffs)
• kstd2.cc (modified) (2 diffs)

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.11 2007-01-31 23:51:23 motsak Exp $ */
+/* $Id: gr_kstd2.cc,v 1.12 2007-02-01 18:53:54 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -20 +20 @@
 #include "kstd1.h"
 #include "khstd.h"
+#include "kutil.h"
 //#include "spolys.h"
 //#include "cntrlc.h"
@@ -936 +937 @@
 
   /* complete reduction of the standard basis--------- */
-  if (TEST_OPT_REDSB){
-     completeReduce(strat); // ???
-
-//    ideal I = strat->Shdl;
-//    ideal erg = kInterRed(I,Q);
-//    assume(I!=erg);
-//    id_Delete(&I, currRing);
-//    strat->Shdl = erg;
-  }
-
+  if (TEST_OPT_SB_1)
+  {
+    int k=1;
+    int j;
+    while(k<=strat->sl)
+    {
+      j=0;
+      loop
+      {
+        if (j>=k) break;
+        clearS(strat->S[j],strat->sevS[j],&k,&j,strat);
+        j++;
+      }
+      k++;
+    }
+  }
+
+  if (TEST_OPT_REDSB)
+     completeReduce(strat);
   /* release temp data-------------------------------- */
   exitBuchMora(strat);

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.36 2007-01-31 10:11:48 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.37 2007-02-01 18:53:54 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -1266 +1266 @@
 #endif
   /* complete reduction of the standard basis--------- */
+  if (TEST_OPT_SB_1)
+  {
+    int k=1;
+    int j;
+    while(k<=strat->sl)
+    {
+      j=0;
+      loop
+      {
+        if (j>=k) break;
+        clearS(strat->S[j],strat->sevS[j],&k,&j,strat);
+        j++;
+      }
+      k++;
+    }
+  }
+
   if (TEST_OPT_REDSB) completeReduce(strat);
   /* release temp data-------------------------------- */