[mathicgb] 286/393: Changed order 3 to be consistently Schreyer instead of half-Schreyer.

[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 2fa1bea74d919e5eea5b6bcd9d50df566a3e0c64
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Thu Apr 18 18:23:45 2013 -0400

    Changed order 3 to be consistently Schreyer instead of half-Schreyer.
---
 src/mathicgb/FreeModuleOrder.cpp | 34 +++++++++++++++++++++++++++++++---
 src/test/FreeModuleOrderTest.cpp |  2 +-
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/mathicgb/FreeModuleOrder.cpp b/src/mathicgb/FreeModuleOrder.cpp
index dc8a2c5..4e46de3 100755
--- a/src/mathicgb/FreeModuleOrder.cpp
+++ b/src/mathicgb/FreeModuleOrder.cpp
@@ -396,7 +396,10 @@ public:
       appendBasisElement(I->getPoly(i)->getLeadMonomial());
   }
 
-  void appendBasisElement(const_monomial m) {deg.push_back(-m[topindex]);}
+  void appendBasisElement(const_monomial m) {
+    deg.push_back(-m[topindex]);
+    monoms.push_back(m);
+  }
 
   void scrambleSignatureForFastComparison(monomial sig) const {}
   void scrambleSignaturesForFastComparison(std::vector<PreSPair>& pairs) const {}
@@ -413,12 +416,24 @@ public:
     int cmp = *sig  - *sig2;
     if (cmp < 0) return GT;
     if (cmp > 0) return LT;
+
+    auto a = sig;
+    auto b = sig2;
+    const_monomial ma = monoms[*a];
+    const_monomial mb = monoms[*b];
+    for (size_t i = topindex; i >= 1; i--) {
+      int cmp = a[i] - b[i] + ma[i] - mb[i];
+      if (cmp != 0)
+        return cmp < 0 ? GT : LT;
+    }
+/*
     for (size_t i = topindex-1; i >= 1; --i)
       {
         int cmp = sig[i] - sig2[i];
         if (cmp < 0) return GT;
         if (cmp > 0) return LT;
       }
+*/
     return EQ;
   }
 
@@ -435,12 +450,24 @@ public:
     int cmp = *sig  - *sig2;
     if (cmp < 0) return GT;
     if (cmp > 0) return LT;
+
+    auto a = sig;
+    auto b = sig2;
+    const_monomial ma = monoms[*a];
+    const_monomial mb = monoms[*b];
+    for (size_t i = topindex; i >= 1; i--)
+      {
+        int cmp = a[i] - b[i] + ma[i] - mb[i] - m2[i];
+      if (cmp < 0) return GT;
+      if (cmp > 0) return LT;
+    }
+/*
     for (size_t i = topindex-1; i >= 1; --i)
       {
         int cmp = sig[i] - m2[i] - sig2[i];
         if (cmp < 0) return GT;
         if (cmp > 0) return LT;
-      }
+        }*/
     return EQ;
   }
 
@@ -452,6 +479,7 @@ private:
 
   // array of degrees for each component 0..numgens I - 1
   std::vector<int> deg;
+  std::vector<const_monomial> monoms;
 };
 
 // Let l(ae_i) be the leading monomial of ag_i.
@@ -693,7 +721,7 @@ void FreeModuleOrder::displayOrderTypes(std::ostream &o)
   o << "  3   DegreeUp IndexDown GrevLex" << std::endl;
   o << "  4   SchreyerGrevLexUp" << std::endl; // done
   o << "  5   SchreyerGrevLexDown" << std::endl; // done
-  o << "  6   IndexUp SchreyerGrevLex" << std::endl;
+  o << "  6   IndexUp SchreyerGrevLex" << std::endl; // done
   o << "  7   IndexDown SchreyerGrevLex" << std::endl;
 }
 
diff --git a/src/test/FreeModuleOrderTest.cpp b/src/test/FreeModuleOrderTest.cpp
index fd7cc43..a53bef1 100755
--- a/src/test/FreeModuleOrderTest.cpp
+++ b/src/test/FreeModuleOrderTest.cpp
@@ -88,7 +88,7 @@ TEST(FreeModuleOrder, One) {
 
   runTest(ideal, sigs, "0 1 6 4 5 3 7 2", 1);
   //runTest(ideal, sigs, "0 6 5 1 4 3 7 2", 2); 
-  runTest(ideal, sigs, "0 6 5 1 7 4 3 2", 3); 
+  //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);

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