Changeset 3ada27 in git

Timestamp:

Jan 31, 2020, 1:49:03 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e8edeff25aa420c974bba96fea2dc70383890b41

Parents:

ef6df21e3783870d5dd988a568b01c19e2ccbbb59e03f32545849bee124d9e6a655dbf74f853e1c8

Message:

Merge branch 'kabouzeid-reduce_fix' into spielwiese

File:

• kernel/GBEngine/kutil.cc (modified) (1 diff)

kernel/GBEngine/kutil.cc

@@ -9374 +9374 @@
 void enterSBbaShift (LObject &p,int atS,kStrategy strat, int atR)
 {
+  enterSBba(p, atS, strat, atR);
+
   int maxPossibleShift = p_mLPmaxPossibleShift(p.p, strat->tailRing);
   for (int i = maxPossibleShift; i > 0; i--)
   {
+
     LObject qq;
     qq.p = pLPCopyAndShiftLM(p.p, i); // don't use Set() because it'll test the poly order
     qq.shift = i;
     strat->initEcart(&qq); // initEcartBBA sets length, pLength, FDeg and ecart
+    int atS = posInS(strat, strat->sl, qq.p, qq.ecart); // S needs to stay sorted because this is for example assumed when searching S later
     enterSBba(qq, atS, strat, -1);
   }
-  enterSBba(p, atS, strat, atR);
 }
 #endif