Changeset 18ef40 in git for kernel

Timestamp:

Dec 8, 2008, 11:00:44 AM (15 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6b84331e2b20793ec5e9a095f67e337bc2a04e8b

Parents:

8d14d6727730a17792390dffc7ccbaa20400a1d9

Message:

mea culpa


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

Location:

kernel

Files:

• kstd1.cc (modified) (5 diffs)
• kutil.cc (modified) (4 diffs)

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.41 2008-12-04 14:13:37 wienand Exp $ */
+/* $Id: kstd1.cc,v 1.42 2008-12-08 10:00:44 wienand Exp $ */
 /*
 * ABSTRACT:
@@ -951 +951 @@
   }
   #endif
-  return;
   if ((!strat->kHEdgeFound) || (strat->kNoether!=NULL)) HEckeTest(p.p,strat);
   if (strat->kHEdgeFound)
@@ -1226 +1225 @@
     {
       /*- deletes the short spoly and computes -*/
-#ifdef HAVE_RINGS
+#ifdef HAVE_RINGS_LOC
       if (rField_is_Ring(currRing))
         pLmDelete(strat->P.p);
@@ -1286 +1285 @@
       enterT(strat->P,strat);
       // build new pairs
-#ifdef HAVE_RINGS
+#ifdef HAVE_RINGS_LOC
       if (rField_is_Ring(currRing))
         superenterpairs(strat->P.p,strat->sl,strat->P.ecart,0,strat, strat->tl);
@@ -1302 +1301 @@
       // clear strat->P
       if (strat->P.lcm!=NULL) 
-#ifdef HAVE_RINGS
+#ifdef HAVE_RINGS_LOC
         pLmDelete(strat->P.lcm);
 #else

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.113 2008-12-04 14:13:37 wienand Exp $ */
+/* $Id: kutil.cc,v 1.114 2008-12-08 10:00:44 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -315 +315 @@
   poly p = L->GetLmTailRing();
 
-#ifdef HAVE_RINGS
+#ifdef HAVE_RINGS_LOC
   // Leading coef have to be a unit
   if ( !(nIsUnit(p_GetCoeff(p, r))) ) return;
@@ -5091 +5091 @@
   if (!pIsVector((*p).p) && ((*p).ecart != 0))
   {
-#ifdef HAVE_RINGS
+#ifdef HAVE_RINGS_LOC
     // Leading coef have to be a unit
     if ( !(nIsUnit(p_GetCoeff((*p).p, r))) ) return;
@@ -5106 +5106 @@
         (*p).ecart = 0;
         (*p).length = 1;
-#ifdef HAVE_RINGS
+#ifdef HAVE_RINGS_LOC
         (*p).pLength = 1;  // Why wasn't this set already?
 #endif