Changeset 93ebe1 in git for kernel/kspoly.cc

Timestamp:

Jun 25, 2008, 1:27:31 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

c0f7e2988b957111af5de1cc61d5db94117bbd43

Parents:

50be61b82bf6629f723c7dfbd65a3a1d7e764ca6

Message:

*hannes: rings


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

File:

• kernel/kspoly.cc (modified) (14 diffs)

kernel/kspoly.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kspoly.cc,v 1.14 2008-02-23 20:13:30 levandov Exp $ */
+/* $Id: kspoly.cc,v 1.15 2008-06-25 11:27:31 Singular Exp $ */
 /*
 *  ABSTRACT -  Routines for Spoly creation and reductions
@@ -228 +228 @@
     a2 = tailRing->p_Procs->pp_Mult_mm(a2, m2, tailRing,last);
 #ifdef HAVE_RINGS
-  if (rField_is_Ring(currRing) && !(rField_is_Domain(currRing))) l2 = pLength(a2);
+  if (!(rField_is_Domain(currRing))) l2 = pLength(a2);
 #endif
 
@@ -365 +365 @@
 
 #ifdef HAVE_RINGS
+  BOOLEAN is_Ring=rField_is_Ring(currRing);
   number lc1 = pGetCoeff(p1), lc2 = pGetCoeff(p2);
-  if (rField_is_Ring(currRing))
+  if (is_Ring)
   {
     ksCheckCoeff(&lc1, &lc2); // gcd and zero divisors
@@ -414 +415 @@
       p_Setm(m2, currRing);
 #ifdef HAVE_RINGS
-      if (rField_is_Ring(currRing))
+      if (is_Ring)
       {
           nDelete(&lc1);
@@ -429 +430 @@
     {
 #ifdef HAVE_RINGS
-    if (rField_is_Ring(currRing))
+    if (is_Ring)
     {
       nDelete(&lc1);
@@ -466 +467 @@
     p_Setm(m1, currRing);
 #ifdef HAVE_RINGS
-    if (rField_is_Ring(currRing))
+    if (is_Ring)
     {
       pSetCoeff0(m1, t2);
@@ -523 +524 @@
         p_LmFree(m2,currRing);
 #ifdef HAVE_RINGS
-        if (rField_is_Ring(currRing))
+        if (is_Ring)
         {
           pSetCoeff0(m1, t2);
@@ -539 +540 @@
         p_LmFree(m1,currRing);
 #ifdef HAVE_RINGS
-        if (rField_is_Ring(currRing))
+        if (is_Ring)
         {
           pSetCoeff0(m2, t1);
@@ -553 +554 @@
     }
 #ifdef HAVE_RINGS
-    if (rField_is_Ring(currRing))
+    if (is_Ring)
     {
       equal = nEqual(t1,t2);
@@ -570 +571 @@
       p_LmFree(m2,currRing);
 #ifdef HAVE_RINGS
-      if (rField_is_Ring(currRing))
+      if (is_Ring)
       {
           pSetCoeff0(m1, nSub(t1, t2));
@@ -586 +587 @@
     pIter(a2);
 #ifdef HAVE_RINGS
-    if (rField_is_Ring(currRing))
+    if (is_Ring)
     {
       if (a2 != NULL)
@@ -598 +599 @@
         t2 = nMult(pGetCoeff(a1),lc2);
       }
-      while (a1 != NULL && nIsZero(t2))
+      while ((a1 != NULL) && nIsZero(t2))
       {
         pIter(a1);
@@ -607 +608 @@
         }
       }
-      while (a2 != NULL && nIsZero(t1))
+      while ((a2 != NULL) && nIsZero(t1))
       {
         pIter(a2);
@@ -624 +625 @@
       {
 #ifdef HAVE_RINGS
-        if (rField_is_Ring(currRing))
+        if (is_Ring)
         {
           nDelete(&lc1);