[mathicgb] 334/393: Removed MonTableNaive, which wasn't necessary any more.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Fri Apr 3 15:59:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch upstream
in repository mathicgb.
commit 1f27738c4ff6ca74219d2cc1198934d2294c6dc3
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date: Mon Aug 26 18:40:19 2013 +0200
Removed MonTableNaive, which wasn't necessary any more.
---
Makefile.am | 1 -
build/vs12/mathicgb-lib/mathicgb-lib.vcxproj | 2 -
.../vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters | 6 -
src/mathicgb/MTArray.cpp | 5 -
src/mathicgb/MonTableNaive.cpp | 169 -------------
src/mathicgb/MonTableNaive.hpp | 81 ------
src/test/gb-test.cpp | 281 ++++++++++-----------
src/test/pict.in | 2 +-
8 files changed, 141 insertions(+), 406 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 823429c..17590cf 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@ libmathicgb_la_SOURCES = src/mathicgb/BjarkeGeobucket2.cpp \
src/mathicgb/io-util.cpp src/mathicgb/io-util.hpp \
src/mathicgb/KoszulQueue.hpp src/mathicgb/MonomialHashTable.hpp \
src/mathicgb/MonTableDivList.hpp src/mathicgb/MonTableKDTree.hpp \
- src/mathicgb/MonTableNaive.cpp src/mathicgb/MonTableNaive.hpp \
src/mathicgb/MTArray.cpp src/mathicgb/MTArray.hpp \
src/mathicgb/PairTriangle.cpp src/mathicgb/PairTriangle.hpp \
src/mathicgb/Poly.cpp src/mathicgb/Poly.hpp \
diff --git a/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj b/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj
index a568045..46b17f6 100755
--- a/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj
+++ b/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj
@@ -457,7 +457,6 @@
<ClCompile Include="..\..\..\src\mathicgb\io-util.cpp" />
<ClCompile Include="..\..\..\src\mathicgb\LogDomain.cpp" />
<ClCompile Include="..\..\..\src\mathicgb\LogDomainSet.cpp" />
- <ClCompile Include="..\..\..\src\mathicgb\MonTableNaive.cpp" />
<ClCompile Include="..\..\..\src\mathicgb\MTArray.cpp" />
<ClCompile Include="..\..\..\src\mathicgb\PairTriangle.cpp" />
<ClCompile Include="..\..\..\src\mathicgb\Poly.cpp" />
@@ -512,7 +511,6 @@
<ClInclude Include="..\..\..\src\mathicgb\MonoProcessor.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\MonTableDivList.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\MonTableKDTree.hpp" />
- <ClInclude Include="..\..\..\src\mathicgb\MonTableNaive.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\MTArray.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\mtbb.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\NonCopyable.hpp" />
diff --git a/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters b/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters
index 324575c..7c97ddc 100755
--- a/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters
+++ b/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters
@@ -38,9 +38,6 @@
<ClCompile Include="..\..\..\src\mathicgb\io-util.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\src\mathicgb\MonTableNaive.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\mathicgb\MTArray.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -178,9 +175,6 @@
<ClInclude Include="..\..\..\src\mathicgb\MonTableKDTree.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\src\mathicgb\MonTableNaive.hpp">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\src\mathicgb\MTArray.hpp">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/src/mathicgb/MTArray.cpp b/src/mathicgb/MTArray.cpp
index 42bb736..1cbc88b 100755
--- a/src/mathicgb/MTArray.cpp
+++ b/src/mathicgb/MTArray.cpp
@@ -3,7 +3,6 @@
#include "stdinc.h"
#include "MTArray.hpp"
-#include "MonTableNaive.hpp"
#include "MonTableKDTree.hpp"
#include "MonTableDivList.hpp"
@@ -208,7 +207,6 @@ int MonomialTableArray::displayMTTypes(std::ostream &o)
// returns n s.t. 0..n-1 are valid types
{
o << "Monomial table types:" << std::endl;
- o << " 0 naive" << std::endl;
o << " 1 divlist+divmask" << std::endl;
o << " 2 kdtree+divmask" << std::endl;
o << " 3 divlist" << std::endl;
@@ -219,9 +217,6 @@ int MonomialTableArray::displayMTTypes(std::ostream &o)
std::unique_ptr<MonomialTableArray> MonomialTableArray::make(const PolyRing *R, int typ, size_t components, bool allowRemovals)
{
switch (typ) {
- case 0:
- return make_unique<MTArrayT<MonTableNaive>>(components, R);
-
case 1: {
typedef MonTableDivList<false,true> MT;
return make_unique<MTArrayT<MT>>(components, MT::Configuration
diff --git a/src/mathicgb/MonTableNaive.cpp b/src/mathicgb/MonTableNaive.cpp
deleted file mode 100755
index 35a90dd..0000000
--- a/src/mathicgb/MonTableNaive.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-// MathicGB copyright 2012 all rights reserved. MathicGB comes with ABSOLUTELY
-// NO WARRANTY and is licensed as GPL v2.0 or later - see LICENSE.txt.
-#include "stdinc.h"
-#include "MonTableNaive.hpp"
-
-#include <ostream>
-#include <iostream>
-
-MATHICGB_NAMESPACE_BEGIN
-
-MonTableNaive::MonTableNaive(const PolyRing *R) :
- conf_(R),
- mPool(sizeof(mon_node)),
- table(0)
-{
- stats_.n_member = 0;
- stats_.n_inserts = 0;
- stats_.n_insert_already_there = 0;
- stats_.n_compares = 0;
-}
-
-MonTableNaive::MonTableNaive(const Configuration& C) :
- conf_(C),
- mPool(sizeof(mon_node)),
- table(0)
-{
- stats_.n_member = 0;
- stats_.n_inserts = 0;
- stats_.n_insert_already_there = 0;
- stats_.n_compares = 0;
-}
-
-MonTableNaive::~MonTableNaive()
-{
- // Nothing to do?
-}
-
-bool MonTableNaive::member(const_monomial t, ValueType &result_val) const
-{
- result_val = 0;
- stats_.n_member++;
- for (mon_node *p = table; p != 0; p = p->next)
- {
- stats_.n_compares++;
- switch (getPolyRing()->monomialCompare(p->monom, t))
- {
- case GT:
- return false;
- case EQ:
- // Already exists, leave
- return true;
- case LT:
- // Check divisibility
- if (getPolyRing()->monomialIsDivisibleBy(t, p->monom))
- return true;
- }
- }
- return false;
-}
-
-void MonTableNaive::insert_node(mon_node *p, const_monomial t)
-{
- mon_node *q = static_cast<mon_node *>(mPool.alloc());
- q->next = p->next;
- p->next = q;
- q->monom = t;
-
- // Now remove the elements of the list p->next which are
- // divisible by q->monom
-
- mon_node *r = q;
- while (r->next != 0)
- {
- if (getPolyRing()->monomialIsDivisibleBy(r->next->monom, q->monom))
- {
- // remove this term:
- mon_node *a = r->next;
- r->next = a->next;
- mPool.free(a);
- }
- else
- r = r->next;
- }
-}
-
-bool MonTableNaive::insert(const_monomial t, ValueType /* val_ignored */)
-{
- stats_.n_inserts++;
- // Only inserts if not in the table...
- mon_node head;
- head.next = table;
- mon_node *f = &head;
- while (f->next != 0)
- {
- stats_.n_compares++;
- switch (getPolyRing()->monomialCompare(f->next->monom, t))
- {
- case GT:
- // Insert t before f->next
- insert_node(f, t);
- table = head.next;
- return true;
- case EQ:
- // Already exists, leave
- stats_.n_insert_already_there++;
- return false;
- case LT:
- // Check divisibility
- if (getPolyRing()->monomialIsDivisibleBy(t, f->next->monom))
- {
- stats_.n_insert_already_there++;
- return false;
- }
- f = f->next;
- }
- }
- insert_node(f, t);
- table = head.next;
- return true;
-}
-
-size_t MonTableNaive::n_elems() const
-{
- size_t len = 0;
- for (mon_node *q = table; q != 0; q = q->next) len++;
- return len;
-}
-
-void MonTableNaive::getMonomials(std::vector<const_monomial>& monomials) {
- for (mon_node *p = table; p != 0; p=p->next)
- monomials.push_back(p->monom);
-}
-
-void MonTableNaive::display(std::ostream &o, int /* level */) const
-{
- o << n_elems() << ": ";
- for (mon_node *p = table; p != 0; p=p->next)
- {
- getPolyRing()->monomialDisplay(o, p->monom, false);
- o << " ";
- }
- o << std::endl;
-}
-
-void MonTableNaive::displayStats(std::ostream &o) const
-{
- o << " #elements: " << n_elems() << std::endl;
- o << " #calls member: " << stats_.n_member << std::endl;
- o << " #calls insert, but already there: " << stats_.n_insert_already_there << std::endl;
- o << " #compares: " << stats_.n_compares << std::endl;
-}
-
-void MonTableNaive::dump(int level) const
-{
- displayStats(std::cerr);
- if (level > 0) display(std::cerr, level-1);
-}
-
-std::string MonTableNaive::getName() const
-{
- return "naive";
-}
-
-size_t MonTableNaive::getMemoryUse() const
-{
- return mPool.getMemoryUse();
-}
-
-MATHICGB_NAMESPACE_END
diff --git a/src/mathicgb/MonTableNaive.hpp b/src/mathicgb/MonTableNaive.hpp
deleted file mode 100755
index f570401..0000000
--- a/src/mathicgb/MonTableNaive.hpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// MathicGB copyright 2012 all rights reserved. MathicGB comes with ABSOLUTELY
-// NO WARRANTY and is licensed as GPL v2.0 or later - see LICENSE.txt.
-#ifndef MATHICGB_MON_TABLE_NAIVE_GUARD
-#define MATHICGB_MON_TABLE_NAIVE_GUARD
-
-#include "PolyRing.hpp"
-#include <memtailor.h>
-
-MATHICGB_NAMESPACE_BEGIN
-
-struct mon_node { // each node is in 'nodes' arena
- mon_node *next;
- const_monomial monom; // points into 'monoms'
-};
-
-class MonTableNaiveConfiguration
-{
-public:
- MonTableNaiveConfiguration(const PolyRing *R) : R_(R) {}
-
- const PolyRing * getPolyRing() const { return R_; }
-
-private:
- const PolyRing *R_;
-};
-
-class MonTableNaive {
-public:
- typedef size_t ValueType;
- typedef MonTableNaiveConfiguration Configuration;
-
- MonTableNaive(const PolyRing *R);
- MonTableNaive(const Configuration& C);
- ~MonTableNaive();
-
- Configuration& getConfiguration() { return conf_; }
- const Configuration& getConfiguration() const { return conf_; }
-
- const PolyRing * getPolyRing() const { return conf_.getPolyRing(); }
-
- bool member(const_monomial t, ValueType & val) const;
- bool insert(const_monomial t, ValueType val = 0); // Only insert if not there
-
- std::string getName() const;
- void display(std::ostream &o, int level) const;
- void dump(int level) const;
-
- size_t n_elems() const;
-
- void displayStats(std::ostream &o) const;
-
- struct Stats {
- size_t n_member;
- size_t n_inserts; // includes koszuls
- size_t n_insert_already_there;
- size_t n_compares;
- };
-
- void getStats(Stats &stats) const { stats = stats_; }
-
- size_t getMemoryUse() const;
-
- void getMonomials(std::vector<const_monomial>& monomials);
-
-private:
- void insert_node(mon_node *p, const_monomial t);
-
- // For now, keep a sorted linked list of monomials (in increasing order), one such list for each component found
- // member: just goes through each one, checking for divisibility
- // insert: find insertion spot, insert it, then try to remove ones after that that are not needed
- Configuration conf_;
-
- memt::BufferPool mPool; // used for mon_node's
- mon_node *table;
-
- // stats:
- mutable Stats stats_;
-};
-
-MATHICGB_NAMESPACE_END
-#endif
diff --git a/src/test/gb-test.cpp b/src/test/gb-test.cpp
index e3dbc2a..bfc9a1b 100755
--- a/src/test/gb-test.cpp
+++ b/src/test/gb-test.cpp
@@ -52,146 +52,145 @@ void testGB(
// pict.in for details.
#define MATHICGB_ESCAPE_MULTILINE_STRING(str) #str
char const allPairsTests[] = MATHICGB_ESCAPE_MULTILINE_STRING(
-spairQueue reducerType divLookup monTable buchberger postponeKoszul useBaseDivisors autoTailReduce autoTopReduce preferSparseReducers useSingularCriterionEarly sPairGroupSize threadCount
-0 11 4 0 0 0 0 0 0 0 0 1 1
-1 13 1 1 0 1 1 0 0 1 1 0 2
-3 16 2 2 1 0 0 1 1 1 0 10 8
-2 4 3 2 0 1 1 0 0 0 1 100 8
-2 14 3 1 1 0 0 1 1 0 0 0 1
-1 2 1 0 1 0 0 1 1 1 0 100 2
-3 23 2 0 0 0 1 0 0 1 1 2 1
-0 21 4 2 1 0 0 1 1 0 0 2 2
-0 21 4 1 0 1 1 0 0 1 1 1 8
-1 26 2 2 1 0 0 0 1 0 0 1 2
-3 19 1 1 1 0 0 1 0 0 0 100 1
-2 9 3 0 0 1 1 0 0 1 0 2 8
-2 10 1 2 0 1 0 0 0 1 1 1 1
-0 2 2 2 0 1 1 0 0 0 1 0 8
-3 15 3 1 1 0 0 1 1 1 0 1 2
-3 25 4 0 1 0 0 1 0 1 0 0 8
-1 23 1 1 1 0 0 1 1 0 0 0 8
-1 15 4 2 0 1 1 0 0 0 1 0 1
-2 20 2 1 1 0 0 1 0 1 0 100 2
-0 26 3 0 1 0 0 1 0 1 0 0 1
-0 4 1 1 1 0 0 1 1 1 0 2 2
-2 22 4 1 1 0 0 0 1 0 0 1 1
-3 17 4 1 0 1 1 0 0 1 1 100 8
-1 22 3 2 0 1 1 0 0 1 1 100 8
-0 25 1 1 1 0 0 0 1 0 0 10 1
-0 23 4 2 0 1 0 0 0 1 1 100 2
-0 6 2 1 1 0 0 1 0 1 0 100 8
-3 20 1 0 0 1 1 0 0 0 1 0 1
-3 1 2 2 0 0 0 0 0 0 1 1 1
-1 20 4 0 0 1 1 0 0 0 1 10 8
-3 9 4 1 0 0 0 0 0 0 1 100 1
-0 22 1 0 1 0 0 1 1 0 0 10 2
-1 1 4 1 1 0 0 1 1 1 0 100 8
-1 15 1 0 0 0 0 0 0 1 1 2 8
-2 2 4 1 1 0 0 1 1 0 0 1 1
-2 6 4 0 0 1 1 0 0 0 1 1 1
-0 20 3 2 0 0 0 0 0 0 1 1 8
-0 8 1 1 1 0 0 1 0 0 0 100 8
-0 15 2 0 1 0 0 0 1 0 0 100 8
-2 3 3 1 0 1 0 0 0 0 1 10 2
-2 18 3 2 0 1 1 0 0 1 0 2 1
-2 1 3 0 1 0 0 0 1 0 0 2 2
-3 10 4 1 1 0 0 1 1 0 0 0 8
-3 22 2 1 1 0 0 1 1 1 0 0 8
-0 7 4 2 0 1 0 0 0 0 1 0 2
-1 20 4 2 1 0 0 1 1 0 0 2 2
-0 18 2 0 0 0 0 0 0 0 1 0 2
-0 17 3 0 1 0 0 1 1 0 0 0 2
-1 6 1 2 1 0 0 1 1 1 0 0 2
-0 13 3 0 1 0 0 1 1 0 0 1 1
-3 7 2 0 1 0 0 1 1 1 0 2 8
-1 7 3 1 0 1 1 0 0 0 1 1 1
-1 16 3 0 0 1 1 0 0 0 1 0 2
-1 18 1 1 0 1 1 0 0 0 1 10 8
-1 17 2 2 0 0 0 0 0 0 1 2 1
-1 9 1 2 0 0 0 0 0 0 1 1 2
-1 14 1 0 0 1 1 0 0 1 1 1 8
-0 10 2 0 0 0 1 0 0 0 1 2 2
-3 21 2 0 1 0 0 0 1 0 0 10 1
-1 12 2 0 1 0 0 0 1 0 0 1 1
-0 0 3 2 0 0 1 0 0 0 1 1 2
-3 3 4 0 1 0 0 1 1 1 0 2 8
-1 10 3 0 1 0 0 1 0 1 0 10 8
-2 26 1 1 1 0 0 1 1 1 0 10 8
-2 8 2 0 0 1 1 0 0 1 1 10 2
-3 6 3 0 0 0 0 0 0 1 1 10 1
-1 4 2 0 0 0 0 0 0 1 1 0 1
-3 0 1 0 1 0 0 1 1 1 0 2 8
-1 8 3 2 1 0 0 0 1 1 0 1 1
-2 12 3 2 0 1 1 0 0 1 1 10 8
-2 21 3 2 0 0 0 0 0 1 1 0 8
-0 19 2 2 0 1 1 0 0 1 1 10 2
-1 19 4 0 0 1 0 0 0 1 1 1 8
-0 16 1 1 0 0 1 0 0 1 1 2 1
-0 5 4 2 1 0 0 1 0 0 0 0 1
-3 14 2 2 0 0 0 0 0 0 1 2 2
-3 11 2 1 0 1 1 0 0 1 1 2 8
-3 8 4 2 0 1 1 0 0 1 1 2 1
-2 17 1 0 1 0 0 1 0 0 0 1 1
-0 3 1 2 1 0 0 1 1 1 0 0 1
-1 25 3 2 1 0 0 0 1 1 0 100 2
-2 13 4 2 0 1 0 0 0 0 1 2 8
-2 19 3 1 0 0 1 0 0 0 1 0 2
-1 0 4 1 1 0 0 1 0 0 0 10 1
-1 21 1 2 0 0 1 0 0 0 1 100 2
-0 1 1 1 1 0 0 1 0 0 0 0 2
-3 18 4 1 0 0 1 0 0 1 1 100 1
-0 9 2 0 0 0 0 0 0 1 1 10 8
-3 4 4 2 0 0 1 0 0 0 1 1 2
-3 13 2 1 0 1 0 0 0 1 1 100 8
-2 25 2 2 1 0 0 1 1 0 0 2 1
-3 26 4 2 1 0 0 1 1 1 0 2 8
-1 3 2 0 0 1 1 0 0 0 1 1 1
-3 24 2 1 0 1 1 0 0 0 1 10 1
-1 24 3 2 1 0 0 1 1 1 0 1 2
-3 18 4 0 0 1 0 0 0 1 1 1 1
-0 14 4 0 1 0 0 0 1 1 0 10 1
-3 12 4 1 1 0 0 1 0 1 0 2 2
-2 0 2 1 1 0 0 1 1 0 0 0 1
-0 22 4 1 1 0 0 1 1 0 0 2 1
-2 13 3 2 1 0 0 1 1 1 0 10 2
-0 12 1 1 0 0 0 0 0 0 1 0 2
-0 17 1 0 1 0 0 1 1 1 0 10 2
-1 5 2 1 0 1 1 0 0 1 1 1 8
-2 23 3 0 0 1 0 0 0 1 0 10 2
-2 25 4 2 1 0 0 1 1 0 0 1 1
-2 26 1 0 1 0 0 0 0 1 0 100 1
-1 0 1 0 1 0 0 0 1 1 0 100 8
-2 4 1 2 0 1 1 0 0 1 1 10 8
-2 11 3 2 1 0 0 1 1 1 0 10 2
-2 16 4 2 1 0 0 0 1 1 0 1 8
-3 9 2 2 0 0 1 0 0 1 1 0 1
-2 14 1 2 1 0 0 1 0 0 0 100 8
-3 1 3 2 1 0 0 1 1 1 0 10 2
-0 23 2 0 1 0 0 1 1 0 0 1 2
-0 10 4 0 1 0 0 1 1 1 0 100 1
-2 3 2 2 0 0 1 0 0 0 0 100 2
-3 2 3 2 0 0 1 0 0 1 1 10 2
-2 15 1 1 1 0 0 1 0 1 0 10 8
-1 11 1 0 0 1 0 0 0 0 1 100 2
-2 12 1 1 1 0 0 1 1 1 0 100 2
-1 2 2 2 1 0 0 1 0 1 0 2 1
-0 24 1 0 0 1 0 0 0 1 1 2 8
-2 7 1 1 1 0 0 1 0 1 0 10 1
-1 8 2 1 1 0 0 1 0 1 0 0 2
-2 6 4 1 0 0 1 0 0 1 1 2 1
-2 24 4 2 1 0 0 0 1 0 0 0 2
-2 5 1 0 1 0 0 1 1 1 0 2 2
-3 5 3 0 0 1 1 0 0 0 1 100 8
-2 16 1 0 1 0 0 1 0 1 0 100 2
-3 5 1 0 0 0 1 0 0 0 1 10 1
-3 24 1 1 1 0 0 1 0 1 0 100 2
-0 19 1 2 1 0 0 1 1 1 0 2 1
-3 18 2 1 1 0 0 1 1 0 0 100 8
-1 11 1 2 1 0 0 1 1 1 0 0 8
-2 0 3 1 0 1 1 0 0 0 1 1 2
-0 1 3 0 0 1 1 0 0 0 1 10 1
-3 7 2 0 0 0 0 0 0 1 1 100 1
-2 9 4 1 1 0 0 1 1 0 0 2 2
+spairQueue reducerType divLookup monTable buchberger postponeKoszul useBaseDivisors autoTailReduce autoTopReduce preferSparseReducers useSingularCriterionEarly sPairGroupSize threadCount
+1 11 3 1 0 0 0 0 0 0 0 1 1
+2 8 1 2 0 1 1 0 0 1 1 1 2
+0 3 2 3 1 0 0 1 1 1 0 100 8
+3 23 4 4 0 1 1 0 0 0 1 100 1
+0 0 2 3 0 0 1 0 0 0 1 2 8
+3 24 1 2 1 0 0 1 1 0 0 100 2
+2 3 3 1 0 1 0 0 0 1 1 10 1
+2 16 4 4 1 0 0 1 1 0 0 10 8
+1 5 3 1 1 0 0 1 1 1 0 100 1
+1 14 2 4 1 0 0 1 0 1 0 100 2
+3 0 4 3 1 0 0 0 1 1 0 10 2
+3 18 3 2 1 0 0 0 1 0 0 100 8
+1 20 1 3 1 0 0 0 1 1 0 100 1
+3 16 2 2 1 0 0 1 0 1 0 2 1
+0 23 1 1 1 0 0 1 1 1 0 2 2
+1 6 4 1 1 0 0 0 1 1 0 100 8
+0 23 3 3 1 0 0 1 1 0 0 1 8
+1 1 1 2 1 0 0 0 1 0 0 10 8
+0 8 3 4 1 0 0 1 1 0 0 2 1
+3 2 2 1 1 0 0 0 1 0 0 10 8
+1 11 4 3 0 1 1 0 0 1 1 2 8
+0 13 3 1 0 1 1 0 0 1 0 10 2
+3 1 2 4 0 1 1 0 0 1 1 1 2
+0 22 4 2 1 0 0 1 1 0 0 10 8
+2 6 2 3 0 1 1 0 0 0 1 2 2
+2 18 1 4 0 1 1 0 0 1 1 10 1
+2 21 1 2 1 0 0 1 1 1 0 0 1
+1 26 4 4 1 0 0 1 0 0 0 1 2
+1 24 2 1 0 1 1 0 0 1 1 0 8
+0 20 4 4 0 1 1 0 0 0 1 0 2
+0 10 1 3 0 0 1 0 0 0 1 10 1
+3 6 1 4 0 1 0 0 0 0 1 1 1
+3 11 2 3 0 0 0 0 0 0 1 0 2
+1 2 1 2 0 1 1 0 0 1 1 2 1
+1 10 2 2 1 0 0 1 1 1 0 2 2
+1 9 3 3 0 1 0 0 0 1 1 0 2
+1 3 4 2 0 1 1 0 0 0 0 1 2
+2 26 2 1 1 0 0 0 1 1 0 100 1
+2 4 1 3 0 0 1 0 0 0 1 10 8
+2 23 2 2 0 1 1 0 0 0 1 10 1
+0 7 3 3 0 1 0 0 0 1 1 100 1
+1 8 4 3 0 0 1 0 0 0 1 100 8
+2 15 1 4 0 0 1 0 0 1 0 100 1
+1 13 2 2 0 0 0 0 0 0 1 2 1
+2 2 4 3 1 0 0 1 1 1 0 100 2
+0 2 3 4 1 0 0 1 1 1 0 0 1
+1 16 3 3 0 1 1 0 0 0 1 100 2
+0 25 1 2 1 0 0 1 0 0 0 2 8
+3 9 1 1 1 0 0 1 1 0 0 1 1
+3 21 2 3 0 1 1 0 0 0 1 10 8
+1 21 3 4 0 1 0 0 0 0 1 100 2
+3 17 2 1 0 0 1 0 0 0 1 0 1
+0 5 1 4 0 1 1 0 0 0 1 2 2
+0 17 4 3 1 0 0 1 1 1 0 1 2
+1 23 2 4 0 0 0 0 0 1 1 0 8
+3 8 2 1 1 0 0 1 0 1 0 0 1
+3 3 1 4 1 0 0 1 0 0 0 0 8
+1 7 1 2 1 0 0 1 1 0 0 1 2
+2 2 3 4 0 0 1 0 0 0 0 1 8
+0 16 1 1 1 0 0 1 0 1 0 1 8
+1 4 2 4 1 0 0 1 1 1 0 2 1
+2 7 4 4 1 0 0 0 1 0 0 2 8
+3 5 4 2 0 1 1 0 0 1 1 1 8
+2 1 3 3 0 0 0 0 0 1 1 2 1
+2 13 4 4 0 0 0 0 0 1 1 100 8
+2 5 2 3 0 0 0 0 0 0 1 10 1
+2 14 4 1 0 1 1 0 0 0 1 2 1
+1 25 4 4 1 0 0 0 1 1 0 1 2
+3 10 4 1 1 0 0 1 0 1 0 100 8
+2 0 1 2 0 1 0 0 0 0 1 0 1
+1 15 2 1 0 1 0 0 0 0 1 0 8
+0 21 4 1 1 0 0 0 1 1 0 2 1
+0 4 4 2 0 1 1 0 0 0 1 100 2
+0 12 2 1 1 0 0 1 1 0 0 10 8
+2 17 3 4 0 1 1 0 0 0 1 2 8
+0 9 4 2 0 0 1 0 0 0 0 100 8
+2 11 1 4 1 0 0 1 1 1 0 100 1
+3 5 4 4 0 1 0 0 0 0 1 0 8
+1 16 3 4 1 0 0 0 0 1 0 0 2
+0 24 3 3 0 0 1 0 0 0 1 10 1
+2 24 4 4 1 0 0 1 1 0 0 2 2
+1 22 2 3 0 1 1 0 0 1 1 2 2
+3 24 4 4 0 0 1 0 0 0 1 1 1
+3 13 1 3 1 0 0 1 1 0 0 0 8
+2 25 2 3 1 0 0 1 0 0 0 0 1
+3 7 2 1 0 1 1 0 0 0 1 10 1
+0 14 1 3 0 0 0 0 0 0 1 1 8
+2 19 2 2 1 0 0 1 0 1 0 1 1
+3 7 4 1 0 1 1 0 0 1 1 0 1
+3 15 3 2 0 1 1 0 0 0 1 1 2
+1 17 1 2 0 1 0 0 0 1 1 100 8
+3 25 3 1 1 0 0 0 1 1 0 100 8
+0 21 4 2 0 1 0 0 0 0 0 1 8
+2 20 3 1 0 1 0 0 0 0 1 2 8
+3 19 4 1 0 1 1 0 0 0 1 100 2
+3 26 1 3 1 0 0 1 1 1 0 2 8
+3 4 3 1 1 0 0 0 1 1 0 0 8
+0 3 4 1 1 0 0 1 1 0 0 2 1
+2 9 2 4 0 0 1 0 0 1 0 10 2
+0 11 4 2 0 0 1 0 0 0 0 10 8
+0 18 4 1 1 0 0 1 1 1 0 1 2
+2 10 3 4 1 0 0 1 1 1 0 1 2
+3 20 2 2 0 1 0 0 0 1 1 10 8
+0 19 3 3 1 0 0 0 1 1 0 2 8
+1 19 1 4 0 0 0 0 0 0 1 10 1
+3 14 3 2 1 0 0 0 1 0 0 0 1
+0 1 4 1 1 0 0 1 1 1 0 0 2
+2 12 4 2 0 1 1 0 0 1 1 2 2
+3 22 3 1 1 0 0 0 1 1 0 100 1
+0 20 4 2 0 0 0 0 0 1 1 1 8
+2 22 1 4 1 0 0 0 1 1 0 1 2
+1 25 2 1 1 0 0 0 1 1 0 10 8
+0 26 3 2 1 0 0 0 1 1 0 0 2
+0 9 3 1 1 0 0 1 1 0 0 2 2
+0 10 3 4 1 0 0 1 0 0 0 0 1
+3 13 4 3 1 0 0 1 0 0 0 1 8
+0 6 3 2 1 0 0 1 0 0 0 0 8
+1 0 3 1 0 1 0 0 0 1 1 100 2
+1 12 3 4 0 1 1 0 0 1 1 1 1
+1 0 2 4 0 1 0 0 0 0 1 1 1
+2 1 1 3 1 0 0 0 0 0 0 100 8
+2 19 1 3 1 0 0 1 0 1 0 0 8
+2 14 3 1 1 0 0 0 1 1 0 10 8
+3 12 1 3 0 1 1 0 0 1 1 0 1
+1 18 2 3 1 0 0 1 0 0 0 2 2
+1 12 4 3 1 0 0 1 0 0 0 100 2
+0 15 4 3 1 0 0 1 1 1 0 10 2
+1 6 2 1 0 0 1 0 0 1 1 10 8
+0 17 2 1 0 1 1 0 0 1 0 10 1
+2 4 4 1 0 0 0 0 0 1 1 1 8
+3 18 4 3 0 1 1 0 0 1 1 0 2
+1 8 4 1 1 0 0 0 1 0 0 10 1
+3 26 4 2 1 0 0 1 1 1 0 10 8
+2 22 4 4 0 0 0 0 0 1 1 0 8
+0 0 4 4 1 0 0 1 0 1 0 2 8
+0 15 1 4 0 1 0 0 0 0 1 2 2
+3 10 4 3 0 1 1 0 0 0 0 1 2
+3 20 4 1 1 0 0 1 0 0 0 1 8
);
std::istringstream tests(allPairsTests);
// skip the initial line with the parameter names.
@@ -236,7 +235,7 @@ spairQueue reducerType divLookup monTable buchberger postponeKoszul useBaseDivis
int monTable;
tests >> monTable;
- MATHICGB_ASSERT(0 <= monTable && monTable <= 2);
+ MATHICGB_ASSERT(1 <= monTable && monTable <= 4);
int buchberger;
tests >> buchberger;
diff --git a/src/test/pict.in b/src/test/pict.in
index 1d8cdb0..f471341 100755
--- a/src/test/pict.in
+++ b/src/test/pict.in
@@ -25,7 +25,7 @@
spairQueue: 0,1,2,3
reducerType: 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26
divLookup: 1, 2, 3, 4
-monTable: 0, 1, 2
+monTable: 1, 2, 3, 4
buchberger: 0, 1
postponeKoszul: 0, 1
useBaseDivisors: 0, 1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathicgb.git
More information about the debian-science-commits
mailing list