Changeset f41347f in git for kernel

Timestamp:

Dec 4, 2008, 3:13:37 PM (15 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8d14d6727730a17792390dffc7ccbaa20400a1d9

Parents:

b8b1d8bf67036f530445026e0839121eda08c83d

Message:

Fehler in lokalen Ordnungen und KoefRingen


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

Location:

kernel

Files:

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

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.40 2008-11-12 16:07:20 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.41 2008-12-04 14:13:37 wienand Exp $ */
 /*
 * ABSTRACT:
@@ -951 +951 @@
   }
   #endif
+  return;
   if ((!strat->kHEdgeFound) || (strat->kNoether!=NULL)) HEckeTest(p.p,strat);
   if (strat->kHEdgeFound)
@@ -1083 +1084 @@
   else if (strat->kHEdgeFound || strat->homog)
     strat->red = redFirst;  /*take the first possible in T*/
-#ifdef HAVE_RINGS  //TODO Oliver
-  else if (rField_is_Ring(currRing))
-    strat->red = redRing;
-#endif
   else
     strat->red = redEcart;/*take the first possible in under ecart-restriction*/
@@ -1229 +1226 @@
     {
       /*- deletes the short spoly and computes -*/
+#ifdef HAVE_RINGS
+      if (rField_is_Ring(currRing))
+        pLmDelete(strat->P.p);
+      else
+#endif
       pLmFree(strat->P.p);
       strat->P.p = NULL;
@@ -1284 +1286 @@
       enterT(strat->P,strat);
       // build new pairs
+#ifdef HAVE_RINGS
+      if (rField_is_Ring(currRing))
+        superenterpairs(strat->P.p,strat->sl,strat->P.ecart,0,strat, strat->tl);
+      else
+#endif
       enterpairs(strat->P.p,strat->sl,strat->P.ecart,0,strat, strat->tl);
       // put in S
@@ -1294 +1301 @@
 
       // clear strat->P
-      if (strat->P.lcm!=NULL) pLmFree(strat->P.lcm);
+      if (strat->P.lcm!=NULL) 
+#ifdef HAVE_RINGS
+        pLmDelete(strat->P.lcm);
+#else
+        pLmFree(strat->P.lcm);
+#endif
       strat->P.lcm=NULL;
 #ifdef KDEBUG

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.112 2008-10-14 09:18:36 wienand Exp $ */
+/* $Id: kutil.cc,v 1.113 2008-12-04 14:13:37 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -314 +314 @@
   ring r = L->tailRing;
   poly p = L->GetLmTailRing();
+
+#ifdef HAVE_RINGS
+  // Leading coef have to be a unit
+  if ( !(nIsUnit(p_GetCoeff(p, r))) ) return;
+#endif
 
   if(p_GetComp(p, r) != 0 && !p_OneComp(p, r)) return;
@@ -5086 +5091 @@
   if (!pIsVector((*p).p) && ((*p).ecart != 0))
   {
+#ifdef HAVE_RINGS
+    // Leading coef have to be a unit
+    if ( !(nIsUnit(p_GetCoeff((*p).p, r))) ) return;
+#endif
     k = 0;
     h1 = r = pCopy((*p).p);
@@ -5097 +5106 @@
         (*p).ecart = 0;
         (*p).length = 1;
+#ifdef HAVE_RINGS
+        (*p).pLength = 1;  // Why wasn't this set already?
+#endif
         (*suc)=0;
         return;