Changeset ac434f in git

Timestamp:

Mar 16, 2011, 10:43:39 AM (12 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

b8f199b27a94458ece9173dd4c4eb3449352fbdf

Parents:

2f6ca63579dbf5195f7dbd177e9e67afbfb66dfa

Message:

Revert "removed old switch HAVE_ZERODIVISORS"

This reverts commit dbb0d9b064d608e0b3bb83e30eaf3e2de1ad44f3.

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

Location:

kernel

Files:

• p_Minus_mm_Mult_qq__T.cc (modified) (4 diffs)
• p_Mult_mm__T.cc (modified) (3 diffs)
• p_Mult_nn__T.cc (modified) (1 diff)
• p_Procs_Generate.cc (modified) (2 diffs)
• pp_Mult_mm__T.cc (modified) (3 diffs)
• pp_Mult_nn__T.cc (modified) (2 diffs)

kernel/p_Minus_mm_Mult_qq__T.cc

@@ -67 +67 @@
   Equal:   // qm equals p
   tb = n_Mult(pGetCoeff(q), tm, r);
-#ifdef HAVE_RINGS
+#ifdef HAVE_ZERODIVISORS
   if (!nIsZero(tb)) {
 #endif
@@ -86 +86 @@
     p = p_LmFreeAndNext(p, r);
   }
-#ifdef HAVE_RINGS
+#ifdef HAVE_ZERODIVISORS
   }
   else
@@ -101 +101 @@
 
   Greater:
-#ifdef HAVE_RINGS
+#ifdef HAVE_ZERODIVISORS
   tb = n_Mult(pGetCoeff(q), tneg, r);
   if (!nIsZero(tb))
@@ -108 +108 @@
     pSetCoeff0(qm, n_Mult(pGetCoeff(q), tneg, r));
     a = pNext(a) = qm;       // append qm to result and advance q
-#ifdef HAVE_RINGS
+#ifdef HAVE_ZERODIVISORS
   }
   else

kernel/p_Mult_mm__T.cc

@@ -30 +30 @@
   pAssume(!n_IsZero(ln,ri));
 
-#ifdef HAVE_RINGS
+#ifdef HAVE_ZERODIVISORS
   poly before = p;
 #endif
@@ -37 +37 @@
     pn = pGetCoeff(p);
     number tmp = n_Mult(ln, pn, ri);
-#ifdef HAVE_RINGS
+#ifdef HAVE_ZERODIVISORS
     if (n_IsZero(tmp, ri))
     {
@@ -60 +60 @@
       p_MemAdd(p->exp, m_e, length);
       p_MemAddAdjust(p, ri);
-#ifdef HAVE_RINGS
+#ifdef HAVE_ZERODIVISORS
       before = p;
 #endif

kernel/p_Mult_nn__T.cc

@@ -23 +23 @@
 
   poly q = p;
-#ifdef HAVE_RINGS
+#ifdef HAVE_ZERODIVISORS
   poly old = NULL;
 #endif
   while (p != NULL)
   {
-#ifndef HAVE_RINGS
+#ifndef HAVE_ZERODIVISORS
     number nc = pGetCoeff(p);
     pSetCoeff0(p, n_Mult(n, nc, r));

kernel/p_Procs_Generate.cc

@@ -120 +120 @@
   }
 #endif
+#ifdef HAVE_RINGS
+  if (strcmp(s_field, "RingGeneral") == 0)
+    printf("#define HAVE_ZERODIVISORS\n");
+#endif
   i = 0;
   while (macros_field[i] != NULL)
@@ -192 +196 @@
   printf("#include <kernel/%s__T.cc>\n", s_what);
   printf("#undef %s\n", s_what);
+#ifdef HAVE_RINGS
+  if (strcmp(s_field, "RingGeneral") == 0)
+    printf("#undef HAVE_ZERODIVISORS\n");
+#endif
 #ifndef p_Procs_Static
   printf("#endif // p_Procs_[Kernel|Field*]\n");

kernel/pp_Mult_mm__T.cc

@@ -26 +26 @@
   }
   spolyrec rp;
-#ifdef HAVE_RINGS
+#ifdef HAVE_ZERODIVISORS
   rp.next = NULL;
 #endif
@@ -41 +41 @@
   {
     tmp = n_Mult(ln, pGetCoeff(p), ri);
-#ifdef HAVE_RINGS
+#ifdef HAVE_ZERODIVISORS
     if (! n_IsZero(tmp, ri))
     {
@@ -50 +50 @@
       p_MemSum(q->exp, p->exp, m_e, length);
       p_MemAddAdjust(q, ri);
-#ifdef HAVE_RINGS
+#ifdef HAVE_ZERODIVISORS
     }
     else n_Delete(&tmp, ri);

kernel/pp_Mult_nn__T.cc

@@ -22 +22 @@
   if (p == NULL) return NULL;
   spolyrec rp;
-#ifdef HAVE_RINGS
+#ifdef HAVE_ZERODIVISORS
   rp.next = NULL;
 #endif
@@ -28 +28 @@
   omBin bin = r->PolyBin;
   DECLARE_LENGTH(const unsigned long length = r->ExpL_Size);
+
   do
   {
-#ifndef HAVE_RINGS
+#ifndef HAVE_ZERODIVISORS
     p_AllocBin(pNext(q), bin, r);
     pIter(q);