Changeset f41bd9 in git

Timestamp:

Nov 17, 2006, 3:48:40 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

f7bfe57a1b40c83680cd53d79cc0b6eaa191eb5a

Parents:

cbeafc2d8ef1c1721a0d5867a957c47c3dc013a9

Message:

*hannes: posInS....


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

Location:

kernel

Files:

• kstd2.cc (modified) (2 diffs)
• kutil.cc (modified) (3 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.25 2006-10-24 09:45:22 wienand Exp $ */
+/* $Id: kstd2.cc,v 1.26 2006-11-17 14:47:37 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -88 +88 @@
 
   pAssume(~not_sev == p_GetShortExpVector(p, currRing));
-  //int ende=posInS(strat,*max_ind,p,0)+1+(strat->ak>0)*pGetComp(p);
-  //if (ende>(*max_ind)) ende=(*max_ind);
+#if 0
+  int ende=posInS(strat,*max_ind,p,0)+1+(strat->ak>0)*pGetComp(p);
+  if (ende>(*max_ind)) ende=(*max_ind);
+#else
   int ende=strat->sl;
+#endif  
   (*max_ind)=ende;
   loop

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.35 2006-11-07 10:16:50 wienand Exp $ */
+/* $Id: kutil.cc,v 1.36 2006-11-17 14:48:40 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -2678 +2678 @@
 /*2
 *looks up the position of p in set
-*set[0] is the smallest with respect to the ordering-procedure
-*pComp
+*set[0] is the smallest with respect to the ordering-procedure deg/pComp
 * Assumption: posInS only depends on the leading term
 *             otherwise, bba has to be changed
@@ -2694 +2693 @@
   int pc=pGetComp(p);
   if ((currRing->MixedOrder)
-  //|| (strat->ak>0)
+#if 0
+  || ((strat->ak>0) && ((currRing->order[0]==ringorder_c)||((currRing->order[0]==ringorder_C))))
+#endif
   )
   {