Changeset a6889e in git

Timestamp:

Jan 16, 2006, 4:27:10 AM (18 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', '2fa36c576e6a4ddbb1093b43c7f8e9835e17e52a')

Children:

2be0b378a350d61f44d0245309b730d0dc823681

Parents:

c6022d8f25317f2f6b7390478a1df53933e9e351

Message:

Funktionen erreichbar über extra.cc


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

Location:

kernel

Files:

• kstd2.cc (modified) (8 diffs)
• kutil.h (modified) (2 diffs)
• ringgb.cc (modified) (2 diffs)
• rmodulo2m.cc (modified) (2 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.5 2006-01-13 18:10:04 wienand Exp $ */
+/* $Id: kstd2.cc,v 1.6 2006-01-16 03:27:10 wienand Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -172 +172 @@
 }
 
-poly kFindDivisibleByZeroPoly(LObject* h) {
+poly kFindZeroPoly(poly input_p, ring leadRing, ring tailRing) {
   // m = currRing->ch
+
+  if (input_p == NULL) return NULL;
 
   int k_ind2 = 0;
   int a_ind2 = 0;
 
-  poly p = h->GetLmCurrRing();
+  poly p = input_p;
   poly zeroPoly = NULL;
   long a = (long) pGetCoeff(p);
@@ -188 +190 @@
   }
 
-  for (int i = 1; i <= currRing->N; i++) {
+  for (int i = 1; i <= leadRing->N; i++) {
     a = factorial(pGetExp(p, i));
     k = k * a;
@@ -200 +202 @@
   number tmp1;
   poly tmp2, tmp3;
-  if (currRing->ch <= k_ind2 + a_ind2) {
-    zeroPoly = p_ISet(a, h->tailRing);
-    for (int i = 1; i <= currRing->N; i++) {
+  if (leadRing->ch <= k_ind2 + a_ind2) {
+    zeroPoly = p_ISet(a, tailRing);
+    for (int i = 1; i <= leadRing->N; i++) {
       for (long j = 1; j <= pGetExp(p, i); j++) {
         tmp1 = nInit(j);
-        tmp2 = p_ISet(1, h->tailRing);
-        p_SetExp(tmp2, i, 1, h->tailRing);
-        p_Setm(tmp2, h->tailRing);
+        tmp2 = p_ISet(1, tailRing);
+        p_SetExp(tmp2, i, 1, tailRing);
+        p_Setm(tmp2, tailRing);
         if (nIsZero(tmp1)) {
-          zeroPoly = p_Mult_q(zeroPoly, tmp2, h->tailRing);
+          zeroPoly = p_Mult_q(zeroPoly, tmp2, tailRing);
         }
         else {
-          tmp3 = p_ISet((long) tmp1, h->tailRing);
-          zeroPoly = p_Mult_q(zeroPoly, p_Add_q(tmp2, tmp3, h->tailRing), h->tailRing);
+          tmp3 = p_ISet((long) tmp1, tailRing);
+          zeroPoly = p_Mult_q(zeroPoly, p_Add_q(tmp2, tmp3, tailRing), tailRing);
         }
       }
     }
-    zeroPoly = p_LmDeleteAndNext(zeroPoly, h->tailRing);
+    zeroPoly = p_LmDeleteAndNext(zeroPoly, tailRing);
     tmp2 = pISet(a);
-    for (int i = 1; i <= currRing->N; i++) {
+    for (int i = 1; i <= leadRing->N; i++) {
       pSetExp(tmp2, i, pGetExp(p, i));
     }
@@ -226 +228 @@
     return tmp2;
   }
-  if (currRing->ch - k_ind2 <= a_ind2) {
+  if (leadRing->ch - k_ind2 <= a_ind2) {
     PrintS("Case not implented yet !!!"); PrintLn();
     PrintS("But it should not mae any difference."); PrintLn();
@@ -232 +234 @@
   }
   return NULL;
+}
+
+poly kFindDivisibleByZeroPoly(LObject* h) {
+  return kFindZeroPoly(h->GetLmCurrRing(), currRing, h->tailRing);
 }
 
@@ -241 +247 @@
   if (h->p == NULL && h->t_p == NULL) return 0; // spoly is zero (can only occure with zero divisors)
 
-  if (strat->tl<0) return 1;
+//  if (strat->tl<0) return 1;
   int at,d,i;
   int j = 0;
@@ -262 +268 @@
   loop
   {
-    zeroPoly = NULL; //kFindDivisibleByZeroPoly(h);
+    zeroPoly = kFindDivisibleByZeroPoly(h);
     if (zeroPoly != NULL) {
 #ifdef KDEBUG
       if (TEST_OPT_DEBUG)
       {
+        PrintS("zero poly created: ");
+        wrp(zeroPoly);
+        PrintLn();
         PrintS("zero red:");
       }

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.9 2006-01-13 18:10:05 wienand Exp $ */
+/* $Id: kutil.h,v 1.10 2006-01-16 03:27:10 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -504 +504 @@
  *
  ***************************************************************/
+poly kFindZeroPoly(poly input_p, ring leadRing, ring tailRing);
 ideal bba (ideal F, ideal Q,intvec *w,intvec *hilb,kStrategy strat);
 poly kNF2 (ideal F, ideal Q, poly q, kStrategy strat, int lazyReduce);

kernel/ringgb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ringgb.cc,v 1.3 2006-01-13 18:10:05 wienand Exp $ */
+/* $Id: ringgb.cc,v 1.4 2006-01-16 03:27:10 wienand Exp $ */
 /*
 * ABSTRACT: ringgb interface
@@ -30 +30 @@
 
 poly reduce_poly_fct(poly p, ring r) {
-   return NULL;
+   return kFindZeroPoly(p, r, r);
 }
 

kernel/rmodulo2m.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulo2m.cc,v 1.2 2006-01-13 18:10:06 wienand Exp $ */
+/* $Id: rmodulo2m.cc,v 1.3 2006-01-16 03:27:10 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo 2^m
@@ -244 +244 @@
     nr2mModul=0;
   }
-  PrintS("Modul: ");
-  Print("%d\n", nr2mModul);
+//  PrintS("Modul: ");
+//  Print("%d\n", nr2mModul);
 }