Changeset f0d4069 in git

Timestamp:

Jun 12, 2006, 2:35:13 AM (17 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

09b9c1b1bb4bc6dfc8e876d4d65751e7ed32971f

Parents:

c4c516319dd7380d23251f74e2a664cdb5664571

Message:

[oliver]

kutil.cc, polys.cc, ringgb.cc:
* clean up


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

Location:

kernel

Files:

• kutil.cc (modified) (4 diffs)
• polys.cc (modified) (2 diffs)
• ringgb.cc (modified) (2 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.25 2006-06-12 00:07:11 wienand Exp $ */
+/* $Id: kutil.cc,v 1.26 2006-06-12 00:35:13 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1673 +1673 @@
         {
           if (i < 0)  break;
-          if ((strat->L[i].p2 == p) && pLmEqual(strat->L[j].lcm,strat->L[i].lcm)
-#ifdef HAVE_RING2TOM
-            && pDivisibleBy(strat->L[j].lcm, strat->L[i].lcm)
-#endif
-          )
+          if ((strat->L[i].p2 == p) && pLmEqual(strat->L[j].lcm,strat->L[i].lcm))
           {
             /*L[i] could be canceled but we search for a better one to cancel*/
@@ -1684 +1680 @@
             && (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))
             {
@@ -1815 +1808 @@
   for (j=strat->Ll; j>=0; j--)
   {
-    if (nGreater(pGetCoeff(strat->L[j].lcm), pGetCoeff(p)))
+    if (strat->L[j].lcm != NULL && nGreater(pGetCoeff(strat->L[j].lcm), pGetCoeff(p)))
     {
       if (pCompareChain(p,strat->L[j].p1,strat->L[j].p2,strat->L[j].lcm))

kernel/polys.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.9 2006-06-12 00:07:11 wienand Exp $ */
+/* $Id: polys.cc,v 1.10 2006-06-12 00:35:13 wienand Exp $ */
 
 /*
@@ -935 +935 @@
 
   if (lcm==NULL) return FALSE;
-  #ifdef HAVE_RING2TOM
-  // In coefficient rings, the coefficient plays a role in chain crit TODO
-  if (currRing->cring == 1 && !pLmDivisibleByNoComp(p, lcm)) return FALSE;
-  #endif
 
   for (j=pVariables; j; j--)

kernel/ringgb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ringgb.cc,v 1.11 2006-06-12 00:07:12 wienand Exp $ */
+/* $Id: ringgb.cc,v 1.12 2006-06-12 00:35:13 wienand Exp $ */
 /*
 * ABSTRACT: ringgb interface
@@ -205 +205 @@
       return(0);
     }
-    pDelete(&h);
   }
   Print("I");