Changeset 6d09f28 in git for kernel/kstd2.cc

Timestamp:

Aug 14, 2006, 7:08:37 PM (18 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

d39ce40a2e8c985712a746d769cc723fe80f080f

Parents:

2a5c2f4b88044ea4f445da171e3d11679bd20548

Message:

introduced def HAVE_VANGB
--> compute GB in the ring of function rather than polynomials

kstd2.cc:
* moved ind2 and ind_fact_2 to kutil.h/cc
* bba: enterpairs changes size of T in VANGB case

kutil.h/cc:
* ind2/ind_fact_2 see above
* kCreateZeroPoly: create a zero polynomial with given exponent
* createG0: creates the groebner basis of the vanishing polynomials


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

File:

• kernel/kstd2.cc (modified) (9 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.17 2006-06-07 18:44:23 wienand Exp $ */
+/* $Id: kstd2.cc,v 1.18 2006-08-14 17:08:36 wienand Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -186 +186 @@
 }
 
-long ind2(long arg)
-{
-  long ind = 0;
-  if (arg <= 0) return 0;
-  while (arg%2 == 0)
-  {
-    arg = arg / 2;
-    ind++;
-  }
-  return ind;
-}
-
-long ind_fact_2(long arg)
-{
-  long ind = 0;
-  if (arg <= 0) return 0;
-  if (arg%2 == 1) { arg--; }
-  while (arg > 0)
-  {
-    ind += ind2(arg);
-    arg = arg - 2;
-  }
-  return ind;
-}
-
 poly kFindZeroPoly(poly input_p, ring leadRing, ring tailRing)
 {
@@ -225 +200 @@
 
   long k = 1;
-  // of interest is only k_ind2, special routine for improvement ... TOTO OLIVER
+  // of interest is only k_ind2, special routine for improvement ... TODO OLIVER
   for (int i = 1; i <= leadRing->N; i++)
   {
@@ -282 +257 @@
     return tmp2;
   }
-  long alpha_k = twoPow(leadRing->ch - k_ind2);
+/*  long alpha_k = twoPow(leadRing->ch - k_ind2);
   if (1 == 0 && alpha_k <= a) {  // Temporarly disabled, reducing coefficients not compatible with std TODO Oliver
     zeroPoly = p_ISet((a / alpha_k)*alpha_k, tailRing);
@@ -308 +283 @@
     pNext(tmp2) = zeroPoly;
     return tmp2;
-  }
+  } */
   return NULL;
 }
@@ -343 +318 @@
   loop
   {
-    zeroPoly = NULL; //kFindDivisibleByZeroPoly(h);
+#ifdef HAVE_VANGB
+    zeroPoly = kFindDivisibleByZeroPoly(h);
     if (zeroPoly != NULL)
     {
@@ -366 +342 @@
     }
     else
+#endif
     {
       j = kFindDivisibleByInT(strat->T, strat->sevT, strat->tl, h);
@@ -994 +971 @@
       enterT(strat->P, strat);
 #ifdef HAVE_RING2TOM
+#ifdef HAVE_VANGB
+      int at_R = strat->tl;
+#endif
       if (currRing->cring == 1)
         superenterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
@@ -1000 +980 @@
         enterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
       // posInS only depends on the leading term
+#ifdef HAVE_VANGB
+      strat->enterS(strat->P, pos, strat, at_R);
+#else
       strat->enterS(strat->P, pos, strat, strat->tl);
+#endif
       if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
 //      Print("[%d]",hilbeledeg);