Changeset 7523a7 in git for kernel/kutil.cc

Timestamp:

Jun 12, 2006, 7:40:10 PM (18 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ffde366b5edf43184cdef9fba1212ec84b1b00c5

Parents:

d2bf5007073dfa4f5f78e737768f464d25fcb0b6

Message:

[oliver]

kutil.*:
* clean up


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

File:

• kernel/kutil.cc (modified) (3 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.27 2006-06-12 14:27:23 Singular Exp $ */
+/* $Id: kutil.cc,v 1.28 2006-06-12 17:40:09 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1854 +1854 @@
           deleteInL(strat->L,&strat->Ll,j,strat);
           strat->c3++;
-          Print("|UL|");
+          // Print("|UL|");
         }
       }
@@ -1895 +1895 @@
         if (i < 0)  break;
         // Element is from B and has the same lcm as L[j]
-        if ((strat->L[i].p2 == p) && pLmEqual(strat->L[j].lcm,strat->L[i].lcm)
-#ifdef HAVE_RING2TOM
-          && nGreater(pGetCoeff(strat->L[j].lcm), pGetCoeff(strat->L[i].lcm))
-#endif
-        )
+        if ((strat->L[i].p2 == p) && nGreater(pGetCoeff(strat->L[j].lcm), pGetCoeff(strat->L[i].lcm))
+             && pLmEqual(strat->L[j].lcm,strat->L[i].lcm))
         {
           /*L[i] could be canceled but we search for a better one to cancel*/
           strat->c3++;
-          Print("|EP|");
+          // Print("|EP|");
           if (isInPairsetL(i-1,strat->L[j].p1,strat->L[i].p1,&l,strat)
           && (pNext(strat->L[l].p) == strat->tail)
           && (!pLmEqual(strat->L[i].p,strat->L[l].p))
-#ifdef HAVE_RING2TOM
-//        && 1 == 0
-#endif
           && pDivisibleBy(p,strat->L[l].lcm))
           {