Changeset 7f06cca in git for kernel/kstd2.cc

Timestamp:

Jan 20, 2006, 2:15:07 AM (18 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a725daea0d4b710813033cd5906ef1c1f3437cd3

Parents:

3a123804ad0304c10b9c827a9fd2fa92a12fcd36

Message:

kutil.cc:
--> no criterions for coeff rings

kstd2.cc:
--> complete zero reduction
--> no zero reduction during std


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

File:

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

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.7 2006-01-16 14:02:51 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.8 2006-01-20 01:15:07 wienand Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -164 +164 @@
 */
 
+long twoPow(long arg) {
+  long t = arg;
+  long result = 1;
+  while (t > 0) {
+    result = 2 * result;
+    t--;
+  }
+  return result;
+}
+
 long factorial(long arg)
 {
@@ -194 +204 @@
   }
 
-  for (int i = 1; i <= leadRing->N; i++)
-  {
-    a = factorial(pGetExp(p, i));
+  for (int i = 1; i <= leadRing->N; i++) 
+  {
+    a = factorial(p_GetExp(p, i, leadRing));
     k = k * a;
     while (a%2 == 0)
@@ -213 +223 @@
     for (int i = 1; i <= leadRing->N; i++)
     {
-      for (long j = 1; j <= pGetExp(p, i); j++)
+      for (long j = 1; j <= p_GetExp(p, i,leadRing); j++)
       {
         tmp1 = nInit(j);
@@ -230 +240 @@
       }
     }
+    tmp2 = p_ISet((long) pGetCoeff(zeroPoly), leadRing);
+    for (int i = 1; i <= leadRing->N; i++) {
+      pSetExp(tmp2, i, p_GetExp(zeroPoly, i, leadRing));
+    }
+    p_Setm(tmp2, leadRing);
     zeroPoly = p_LmDeleteAndNext(zeroPoly, tailRing);
-    tmp2 = pISet(a);
-    for (int i = 1; i <= leadRing->N; i++)
-    {
-      pSetExp(tmp2, i, pGetExp(p, i));
-    }
-    pSetm(tmp2);
     pNext(tmp2) = zeroPoly;
     return tmp2;
   }
-  if (leadRing->ch - k_ind2 <= a_ind2)
-  {
-    PrintS("Case not implented yet !!!\n");
-    PrintS("But it should not mae any difference.\n");
-    return zeroPoly;
+  long alpha_k = twoPow(leadRing->ch - k_ind2);
+  if (alpha_k <= a) {
+    zeroPoly = p_ISet((a / alpha_k)*alpha_k, tailRing);
+    for (int i = 1; i <= leadRing->N; i++) {
+      for (long j = 1; j <= p_GetExp(p, i, leadRing); j++) {
+        tmp1 = nInit(j);
+        tmp2 = p_ISet(1, tailRing);
+        p_SetExp(tmp2, i, 1, tailRing);
+        p_Setm(tmp2, tailRing);
+        if (nIsZero(tmp1)) {
+          zeroPoly = p_Mult_q(zeroPoly, tmp2, tailRing);
+        }
+        else {
+          tmp3 = p_ISet((long) tmp1, tailRing);
+          zeroPoly = p_Mult_q(zeroPoly, p_Add_q(tmp2, tmp3, tailRing), tailRing);
+        }
+      }
+    }
+    tmp2 = p_ISet((long) pGetCoeff(zeroPoly), leadRing);
+    for (int i = 1; i <= leadRing->N; i++) {
+      pSetExp(tmp2, i, p_GetExp(zeroPoly, i, leadRing));
+    }
+    p_Setm(tmp2, leadRing);
+    zeroPoly = p_LmDeleteAndNext(zeroPoly, tailRing);
+    pNext(tmp2) = zeroPoly;
+    return tmp2;
   }
   return NULL;
@@ -284 +314 @@
   loop
   {
-    zeroPoly = kFindDivisibleByZeroPoly(h);
+    zeroPoly = NULL;// kFindDivisibleByZeroPoly(h);
     if (zeroPoly != NULL)
     {