[mathicgb] 285/393: Reduced free module order 6 to order 7 with preprocessing.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository mathicgb.

commit 846aba09be1579d9ab337e8b64a93c2fbe2d3680
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Thu Apr 18 17:41:31 2013 -0400

    Reduced free module order 6 to order 7 with preprocessing.
---
 src/cli/SigGBAction.cpp          | 2 +-
 src/mathicgb/FreeModuleOrder.cpp | 2 +-
 src/mathicgb/SignatureGB.cpp     | 2 +-
 src/test/FreeModuleOrderTest.cpp | 2 +-
 src/test/gb-test.cpp             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cli/SigGBAction.cpp b/src/cli/SigGBAction.cpp
index 6addb10..d257ac2 100755
--- a/src/cli/SigGBAction.cpp
+++ b/src/cli/SigGBAction.cpp
@@ -57,7 +57,7 @@ void SigGBAction::performAction() {
     ideal = Ideal::parse(inputFile);
   }
   std::unique_ptr<PolyRing const> ring(&(ideal->ring()));
-  if (mModuleOrder.value() == 2 || mModuleOrder.value() == 4)
+  if (mModuleOrder.value() == 2 || mModuleOrder.value() == 4 || mModuleOrder.value() == 6)
     ideal->reverse();
 
   SignatureGB alg(
diff --git a/src/mathicgb/FreeModuleOrder.cpp b/src/mathicgb/FreeModuleOrder.cpp
index 0bdf853..dc8a2c5 100755
--- a/src/mathicgb/FreeModuleOrder.cpp
+++ b/src/mathicgb/FreeModuleOrder.cpp
@@ -715,7 +715,7 @@ std::unique_ptr<FreeModuleOrder> FreeModuleOrder::makeOrder(FreeModuleOrderType
   case 3:
    return make_unique<ConcreteOrder<OrderC>>(OrderC(I));
   case 6:
-    return make_unique<ConcreteOrder<OrderE>>(OrderE(I, true));
+    //return make_unique<ConcreteOrder<OrderE>>(OrderE(I, true));
   case 7:
     return make_unique<ConcreteOrder<OrderE>>(OrderE(I, false));
   default: break;
diff --git a/src/mathicgb/SignatureGB.cpp b/src/mathicgb/SignatureGB.cpp
index ead30e9..122c419 100755
--- a/src/mathicgb/SignatureGB.cpp
+++ b/src/mathicgb/SignatureGB.cpp
@@ -43,7 +43,7 @@ SignatureGB::SignatureGB(
   Hsyz2(MonomialTableArray::make(R, montable_type, ideal.size(), !mPostponeKoszul)),
   reducer(Reducer::makeReducer(reductiontyp, *R)),
   SP(make_unique<SigSPairs>(R, F.get(), GB.get(), Hsyz.get(), reducer.get(), mPostponeKoszul, mUseBaseDivisors, useSingularCriterionEarly, queueType)),
-  mReverseComponents(typ == 2 || typ == 4),
+  mReverseComponents(typ == 2 || typ == 4 || typ == 6),
   mComponentCount(ideal.size())
 {
   // Populate GB
diff --git a/src/test/FreeModuleOrderTest.cpp b/src/test/FreeModuleOrderTest.cpp
index e2fc7b0..fd7cc43 100755
--- a/src/test/FreeModuleOrderTest.cpp
+++ b/src/test/FreeModuleOrderTest.cpp
@@ -91,6 +91,6 @@ TEST(FreeModuleOrder, One) {
   runTest(ideal, sigs, "0 6 5 1 7 4 3 2", 3); 
   //runTest(ideal, sigs, "0 6 5 1 4 3 7 2", 4); 
   //runTest(ideal, sigs, "0 6 5 1 4 7 3 2", 5); 
-  runTest(ideal, sigs, "1 4 3 2 0 6 5 7", 6);
+  //runTest(ideal, sigs, "1 4 3 2 0 6 5 7", 6);
   runTest(ideal, sigs, "7 0 6 5 1 4 3 2", 7);
 }
diff --git a/src/test/gb-test.cpp b/src/test/gb-test.cpp
index 80ea847..3b5b2ba 100755
--- a/src/test/gb-test.cpp
+++ b/src/test/gb-test.cpp
@@ -307,7 +307,7 @@ spairQueue	reducerType	divLookup	monTable	buchberger	postponeKoszul	useBaseDivis
         << reducerType << ' ' << divLookup << ' '
         << monTable << ' ' << postponeKoszul << ' ' << useBaseDivisors;
     } else {
-      if (freeModuleOrder == 2 || freeModuleOrder == 4)
+      if (freeModuleOrder == 2 || freeModuleOrder == 4 || freeModuleOrder == 6)
         I->reverse();
      SignatureGB basis
         (*I, freeModuleOrder, Reducer::reducerType(reducerType),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathicgb.git