Changeset 009d80 in git for kernel/kbuckets.cc

Timestamp:

May 10, 2007, 10:12:44 AM (17 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4cd2f891f36b9e1d58f0aeaa4683254f54088298

Parents:

4bebba7353438f052b4ad581ede34fa6f31e5a71

Message:

new compile switch: HAVE_RINGS
at total there are now: HAVE_RINGS, HAVE_RING2TOM, HAVE_RINGMODN

kspoly.cc, kstd1.cc, kstd2.cc, kutil.cc, kspoly.cc, polys.cc, ring.*:
adaption of new switches and rField_is_Ring method

numbers.*:
introduced new operation:
  nDivBy(a, b) = Is a divisible by b?

pDebig.cc, pInline1.h:
use of new nDivBy method

p_Mult_q:
new routine for rings

p_*, pp_*:
template switch HAVE_ZERODIVISOR

polys1.cc:
poly exponentation, switches

rmodulo*:
nDivBy implementation, DBTest

structs.h:
nDivBy, ringtype, ringflaga, ringflagb


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

File:

• kernel/kbuckets.cc (modified) (8 diffs)

kernel/kbuckets.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.cc,v 1.31 2007-03-02 09:28:12 Singular Exp $ */
+/* $Id: kbuckets.cc,v 1.32 2007-05-10 08:12:40 wienand Exp $ */
 
 #include "mod2.h"
@@ -21 +21 @@
 
 #ifdef USE_COEF_BUCKETS
-#ifdef HAVE_RING_2TOM
+#ifdef HAVE_RINGS_OLD
 #define MULTIPLY_BUCKET(B,I) do                                        \
   { if (B->coef[I]!=NULL)                                              \
@@ -30 +30 @@
     }                                                                  \
   } while(0)                                                           \
-    if (r->cring == 1) bucket->buckets_length[i] = pLength(bucket->buckets[i]);
+    if (rField_is_Ring(currRing)) bucket->buckets_length[i] = pLength(bucket->buckets[i]);
 #else
 #define MULTIPLY_BUCKET(B,I) do                                        \
@@ -595 +595 @@
       {
         bucket->coef[i] = p_Mult_nn(bucket->coef[i],n,r);
-#ifdef HAVE_RING_2TOM
+#ifdef HAVE_RING2TOM_OLD
         if (r->cring == 1 && (long) bucket->coef[i] == 0) {
           bucket->coef[i] = NULL;
@@ -609 +609 @@
 #else
       bucket->buckets[i] = p_Mult_nn(bucket->buckets[i], n, r);
-#ifdef HAVE_RING2TOM
-      if (r->cring == 1) {
+#ifdef HAVE_RINGS
+      if (rField_is_Ring(currRing)) {
         bucket->buckets_length[i] = pLength(bucket->buckets[i]);
         kBucketAdjust(bucket, i);
@@ -621 +621 @@
 #else
   bucket->p = p_Mult_nn(bucket->p, n, bucket->bucket_ring);
-#ifdef HAVE_RING_2TOM
+#ifdef HAVE_RING2TOM_OLD
   if (r->cring == 1) bucket->buckets_length[i] = pLength(bucket->buckets[i]);
 #endif
@@ -739 +739 @@
     bucket->buckets[i] = NULL;
     bucket->buckets_length[i] = 0;
-#ifdef HAVE_RING2TOM
-    l1 = pLength(p1);
-    assume(pLength(p1) == l1);
+#ifdef HAVE_RINGS
+    if (rField_is_Ring(currRing))
+    {
+      l1 = pLength(p1);
+      assume(pLength(p1) == l1);
+    }
 #endif
     i = pLogLength(l1);
@@ -756 +759 @@
     else {
       p1 = r->p_Procs->pp_Mult_mm(p1, m, r, last);
-#ifdef HAVE_RING2TOM
-      l1 = pLength(p1);
-      i = pLogLength(l1);
+#ifdef HAVE_RINGS
+      if (rField_is_Ring(currRing))
+      {
+        l1 = pLength(p1);
+        i = pLogLength(l1);
+      }
 #endif
     }