Changeset 009d80 in git for kernel/kspoly.cc

Timestamp:

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

Author:

Oliver Wienand <wienand@…>

Branches:

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

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/kspoly.cc (modified) (10 diffs)

kernel/kspoly.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kspoly.cc,v 1.9 2007-02-07 10:49:40 Singular Exp $ */
+/* $Id: kspoly.cc,v 1.10 2007-05-10 08:12:40 wienand Exp $ */
 /*
 *  ABSTRACT -  Routines for Spoly creation and reductions
@@ -213 +213 @@
   else
     a2 = tailRing->p_Procs->pp_Mult_mm(a2, m2, tailRing,last);
-#ifdef HAVE_RING2TOM
-  if (currRing->cring == 1) l2 = pLength(a2);
+#ifdef HAVE_RINGS
+  if (rField_is_Ring(currRing)) l2 = pLength(a2);
 #endif
 
@@ -350 +350 @@
   BOOLEAN equal;
 
-#ifdef HAVE_RING2TOM
+#ifdef HAVE_RINGS
   number lc1 = pGetCoeff(p1), lc2 = pGetCoeff(p2);
   int ct = ksCheckCoeff(&lc1, &lc2); // gcd and zero divisors
-  if (currRing->cring == 1)
+  if (rField_is_Ring(currRing))
   {
     if (a1 != NULL) t2 = nMult(pGetCoeff(a1),lc2);
@@ -397 +397 @@
       }
       p_Setm(m2, currRing);
-#ifdef HAVE_RING2TOM
-      if (currRing->cring == 1)
+#ifdef HAVE_RINGS
+      if (rField_is_Ring(currRing))
           pSetCoeff(m2, t1);
       else
@@ -433 +433 @@
     }
     p_Setm(m1, currRing);
-#ifdef HAVE_RING2TOM
-    if (currRing->cring == 1)
+#ifdef HAVE_RINGS
+      if (rField_is_Ring(currRing))
         pSetCoeff(m1, t2);
     else
@@ -485 +485 @@
       {
         p_LmFree(m2,currRing);
-#ifdef HAVE_RING2TOM
-        if (currRing->cring == 1)
+#ifdef HAVE_RINGS
+        if (rField_is_Ring(currRing))
           pSetCoeff(m1, t2);
         else
@@ -496 +496 @@
       {
         p_LmFree(m1,currRing);
-#ifdef HAVE_RING2TOM
-        if (currRing->cring == 1)
+#ifdef HAVE_RINGS
+        if (rField_is_Ring(currRing))
             pSetCoeff(m2, t1);
         else
@@ -505 +505 @@
       }
     }
-#ifdef HAVE_RING2TOM
-    if (currRing->cring == 1)
+#ifdef HAVE_RINGS
+    if (rField_is_Ring(currRing))
     {
       t1 = nSub(t1, t2);
@@ -524 +524 @@
     {
       p_LmFree(m2,currRing);
-#ifdef HAVE_RING2TOM
-      if (currRing->cring == 1)
+#ifdef HAVE_RINGS
+      if (rField_is_Ring(currRing))
           pSetCoeff(m1, t1);
       else
@@ -534 +534 @@
     pIter(a1);
     pIter(a2);
-#ifdef HAVE_RING2TOM
-    if (currRing->cring == 1)
+#ifdef HAVE_RINGS
+    if (rField_is_Ring(currRing))
     {
       nDelete(&t1);