Changeset e342a2 in git

Timestamp:

Oct 24, 2006, 11:45:22 AM (17 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

6e08adb429cbbf3773369df68b06629870822290

Parents:

3a8d345bf7b5a2c27d4d61b0d414df5302626e75

Message:

kutil.cc:
* changes on creating of zero polys

kstd2.cc:
* HAVE_VANGB new switch for gb with or without zeropolys


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

Location:

kernel

Files:

• kstd2.cc (modified) (6 diffs)
• kutil.cc (modified) (11 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.24 2006-10-17 16:17:53 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.25 2006-10-24 09:45:22 wienand Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -317 +317 @@
   int j = 0;
   int pass = 0;
-  poly zeroPoly;
+  poly zeroPoly = NULL;
 
 // TODO warum SetpFDeg notwendig?
@@ -333 +333 @@
 #ifdef HAVE_VANGB
     zeroPoly = kFindDivisibleByZeroPoly(h);
-#else
-    zeroPoly = NULL;
-#endif
     if (zeroPoly != NULL)
     {
@@ -358 +355 @@
     }
     else
+#endif
     {
       j = kFindDivisibleByInT(strat->T, strat->sevT, strat->tl, h);
@@ -378 +376 @@
 
     ksReducePoly(h, &(strat->T[j]), NULL, NULL, strat);
+#ifdef HAVE_VANGB
     if (zeroPoly != NULL)
     {
@@ -383 +382 @@
       strat->tl--;
     }
+#endif
 
 #ifdef KDEBUG

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.33 2006-10-17 16:17:53 Singular Exp $ */
+/* $Id: kutil.cc,v 1.34 2006-10-24 09:45:22 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -2090 +2090 @@
 /* Helper for kCreateZeroPoly
  * enumerating the exponents
+ring r = 2^2, (a, b, c), lp; ideal G0 = system("createG0"); ideal G = interred(G0); ncols(G0); ncols(G);
  */
 
-int nextZeroSimplexExponent (long exp[], long ind[], long cexp[], long cind[], long* cabsind, long bound, long N)
+int nextZeroSimplexExponent (long exp[], long ind[], long cexp[], long cind[], long* cabsind, long step[], long bound, long N)
 /* gives the next exponent from the set H_1 */
 {
-  if (*cabsind < bound)
+  long add = ind2(cexp[1] + 2);
+  if ((*cabsind < bound) && (*cabsind - step[1] + add < bound))
   {
     cexp[1] += 2;
-    long add = ind2(cexp[1]);
     cind[1] += add;
     *cabsind += add;
@@ -2111 +2112 @@
     *cabsind -= cind[i];
     cind[i] = ind[i];
+    step[i] = 500000;
     *cabsind += cind[i];
     // Print("in: %d\n", *cabsind);
     i += 1;
     if (i > N) return 0;
+    do
+    {
+      step[1] = 500000;
+      for (int j = i + 1; j <= N; j++)
+      {
+        if (step[1] > step[j]) step[1] = step[j];
+      }
+      add = ind2(cexp[i] + 2);
+      if (*cabsind - step[1] + add >= bound)
+      {
+        cexp[i] = exp[i];
+        *cabsind -= cind[i];
+        cind[i] = ind[i];
+        *cabsind += cind[i];
+        step[i] = 500000;
+        i += 1;
+        if (i > N) return 0;
+      }
+      else step[1] = -1;
+    } while (step[1] != -1);
+    step[1] = 500000;
     cexp[i] += 2;
-    long add = ind2(cexp[i]);
     cind[i] += add;
     *cabsind += add;
+    if (add < step[i]) step[i] = add;
+    for (i = 2; i <= N; i++)
+    {
+      if (step[1] > step[i]) step[1] = step[i];
+    }
   }
   return 1;
@@ -2205 +2232 @@
   long cabsind = 0;        // The abs. index of cexp, i.e. the sum of cind
   long habsind = 0;        // The abs. index of the coefficient of h
+  long step[50];           // The last increases
   for (int i = 1; i <= currRing->N; i++)
   {
@@ -2217 +2245 @@
     cabsind += ind[i];
     cind[i] = ind[i];
-  }
+    step[i] = 500000;
+  }
+  step[1] = 500000;
   habsind = ind2((long) p_GetCoeff(p, currRing));
   long bound = currRing->ch - habsind;
@@ -2231 +2261 @@
   if (cabsind == 0)
   {
-    if (!(nextZeroSimplexExponent(exp, ind, cexp, cind, &cabsind, bound, currRing->N)))
+    if (!(nextZeroSimplexExponent(exp, ind, cexp, cind, &cabsind, step, bound, currRing->N)))
     {
       return;
@@ -2251 +2281 @@
     enterOneZeroPairRing(zeroPoly, t_p, p, ecart, strat, atR);
   }
-  while ( nextZeroSimplexExponent(exp, ind, cexp, cind, &cabsind, bound, currRing->N) );
+  while ( nextZeroSimplexExponent(exp, ind, cexp, cind, &cabsind, step, bound, currRing->N) );
 }
 
@@ -2268 +2298 @@
   long cabsind = 0;        // The abs. index of cexp, i.e. the sum of cind
   long habsind = 0;        // The abs. index of the coefficient of h
+  long step[50];           // The last increases
   for (int i = 1; i <= currRing->N; i++)
   {
@@ -2273 +2304 @@
     cexp[i] = exp[i];
     ind[i] = 0;
+    step[i] = 500000;
     cind[i] = ind[i];
   }
   long bound = currRing->ch;
+  step[1] = 500000;
 #ifdef OLI_DEBUG
   PrintS("-------------\npoly  :");
@@ -2287 +2320 @@
   if (cabsind == 0)
   {
-    if (!(nextZeroSimplexExponent(exp, ind, cexp, cind, &cabsind, bound, currRing->N)))
+    if (!(nextZeroSimplexExponent(exp, ind, cexp, cind, &cabsind, step, bound, currRing->N)))
     {
       return idInit(1, 1);
@@ -2311 +2344 @@
     G0->m[IDELEMS(G0) - 1] = zeroPoly;
   }
-  while ( nextZeroSimplexExponent(exp, ind, cexp, cind, &cabsind, bound, currRing->N) );
+  while ( nextZeroSimplexExponent(exp, ind, cexp, cind, &cabsind, step, bound, currRing->N) );
   idSkipZeroes(G0);
   return G0;