Changeset 5efbf9 in git for kernel/GBEngine/kstd2.cc

Timestamp:

May 21, 2016, 1:18:14 AM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

bdebb84b7e5e44a3f0d26a19f9d7ad9a6470e0d6

Parents:

d3963ac9165e16e5233bba73e3dfc49b9c87640e

git-author:

Adi Popescu <adi_popescum@yahoo.de>2016-05-21 01:18:14+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2016-05-23 16:43:26+02:00

Message:

add: posInL and T orderings for Ring case
added tests
Q: Is there a possibility to activate PreIntegerCheck from interpretor?

File:

• kernel/GBEngine/kstd2.cc (modified) (4 diffs)

kernel/GBEngine/kstd2.cc

@@ -188 +188 @@
 #if 1
   int ende;
-  if ((strat->ak>0) || currRing->pLexOrder) ende=strat->sl;
+  if ((strat->ak>0) || currRing->pLexOrder || rField_is_Ring(currRing)) ende=strat->sl;
   else ende=posInS(strat,*max_ind,p,0)+1;
   if (ende>(*max_ind)) ende=(*max_ind);
@@ -1439 +1439 @@
 
   initBuchMoraCrit(strat); /*set Gebauer, honey, sugarCrit*/
-  initBuchMoraPos(strat);
+    if(rField_is_Ring(currRing))
+    initBuchMoraPosRing(strat);
+  else
+    initBuchMoraPos(strat);
   initHilbCrit(F,Q,&hilb,strat);
   initBba(strat);
@@ -1818 +1821 @@
   initSbaCrit(strat); /*set Gebauer, honey, sugarCrit*/
   initSbaPos(strat);
-  //initBuchMoraPos(strat);
   initHilbCrit(F,Q,&hilb,strat);
   initSba(F,strat);
@@ -2899 +2901 @@
 
   initBuchMoraCrit(strat); /*set Gebauer, honey, sugarCrit, NO CHANGES */
-  initBuchMoraPos(strat); /*NO CHANGES YET: perhaps later*/
+  if(rField_is_Ring(currRing))
+    initBuchMoraPosRing(strat);
+  else
+    initBuchMoraPos(strat); /*NO CHANGES YET: perhaps later*/
   initHilbCrit(F,Q,&hilb,strat); /*NO CHANGES*/
   initBbaShift(strat); /* DONE */