[mathicgb] 347/393: Renamed MonomialTableArray to ModuleMonoSet and renamed StaticMonoLookup to StaticMonoMap.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Fri Apr 3 15:59:32 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 681dfdfb6517aa2e2ade04f2da87b1783c358f0a
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date: Thu Aug 29 18:21:04 2013 +0200
Renamed MonomialTableArray to ModuleMonoSet and renamed StaticMonoLookup to StaticMonoMap.
---
Makefile.am | 104 ++++++++++-----------
build/vs12/mathicgb-lib/mathicgb-lib.vcxproj | 6 +-
.../vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters | 16 ++--
src/cli/GBCommonParams.cpp | 4 +-
src/mathicgb/{MTArray.cpp => ModuleMonoSet.cpp} | 16 ++--
src/mathicgb/{MTArray.hpp => ModuleMonoSet.hpp} | 10 +-
src/mathicgb/MonoLookup.cpp | 2 +-
src/mathicgb/SigSPairs.cpp | 4 +-
src/mathicgb/SigSPairs.hpp | 6 +-
src/mathicgb/SignatureGB.cpp | 6 +-
src/mathicgb/SignatureGB.hpp | 8 +-
.../{StaticMonoLookup.hpp => StaticMonoMap.hpp} | 0
src/mathicgb/io-util.cpp | 5 +-
src/mathicgb/io-util.hpp | 4 +-
src/test/gb-test.cpp | 2 +-
src/test/poly-test.cpp | 6 +-
16 files changed, 99 insertions(+), 100 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c70d33e..bdccdc0 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,58 +13,58 @@ libmathicgb_la_LIBADD= $(DEPS_LIBS)
# the sources that are built to make libmathicgb. Listing the headers in
# sources ensure that those files are included in distributions.
-libmathicgb_la_SOURCES = src/mathicgb/BjarkeGeobucket2.cpp \
- src/mathicgb/BjarkeGeobucket2.hpp src/mathicgb/BjarkeGeobucket.cpp \
- src/mathicgb/BjarkeGeobucket.hpp src/mathicgb/ClassicGBAlg.cpp \
- src/mathicgb/ClassicGBAlg.hpp src/mathicgb/ChainedHashTable.cpp \
- src/mathicgb/ChainedHashTable.hpp src/mathicgb/MonoLookup.hpp \
- src/mathicgb/MonoLookup.cpp src/mathicgb/StaticMonoLookup.hpp \
- src/mathicgb/SigPolyBasis.cpp src/mathicgb/SigPolyBasis.hpp \
- src/mathicgb/HashTourReducer.cpp src/mathicgb/HashTourReducer.hpp \
- src/mathicgb/Basis.cpp src/mathicgb/Basis.hpp \
- src/mathicgb/io-util.cpp src/mathicgb/io-util.hpp \
- src/mathicgb/KoszulQueue.hpp src/mathicgb/MonomialHashTable.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 \
- src/mathicgb/PolyBasis.cpp src/mathicgb/PolyBasis.hpp \
- src/mathicgb/PolyGeoBucket.cpp src/mathicgb/PolyGeoBucket.hpp \
- src/mathicgb/PolyHashReducer.cpp src/mathicgb/PolyHashReducer.hpp \
- src/mathicgb/PolyHashTable.cpp src/mathicgb/PolyHashTable.hpp \
- src/mathicgb/PolyHeap.cpp src/mathicgb/PolyHeap.hpp \
- src/mathicgb/PolyReducer.cpp src/mathicgb/PolyReducer.hpp \
- src/mathicgb/PolyRing.cpp src/mathicgb/PolyRing.hpp \
- src/mathicgb/Reducer.cpp src/mathicgb/Reducer.hpp \
- src/mathicgb/ReducerDedup.hpp src/mathicgb/ReducerHash.hpp \
- src/mathicgb/ReducerHashPack.hpp src/mathicgb/ReducerHelper.hpp \
- src/mathicgb/ReducerNoDedup.hpp src/mathicgb/ReducerPack.hpp \
- src/mathicgb/ReducerPackDedup.hpp src/mathicgb/SignatureGB.cpp \
- src/mathicgb/SignatureGB.hpp src/mathicgb/SigSPairs.cpp \
- src/mathicgb/SigSPairs.hpp src/mathicgb/SPairs.cpp \
- src/mathicgb/SPairs.hpp src/mathicgb/stdinc.h \
- src/mathicgb/TournamentReducer.cpp \
- src/mathicgb/TournamentReducer.hpp src/mathicgb/SigSPairQueue.hpp \
- src/mathicgb/SigSPairQueue.cpp src/mathicgb/SparseMatrix.hpp \
- src/mathicgb/SparseMatrix.cpp src/mathicgb/QuadMatrixBuilder.hpp \
- src/mathicgb/QuadMatrixBuilder.cpp src/mathicgb/TypicalReducer.cpp \
- src/mathicgb/TypicalReducer.hpp src/mathicgb/F4Reducer.hpp \
- src/mathicgb/F4Reducer.cpp src/mathicgb/F4MatrixBuilder.hpp \
- src/mathicgb/F4MatrixBuilder.cpp src/mathicgb/QuadMatrix.hpp \
- src/mathicgb/QuadMatrix.cpp src/mathicgb/F4MatrixReducer.cpp \
- src/mathicgb/F4MatrixReducer.hpp src/mathicgb/MonomialMap.hpp \
- src/mathicgb/RawVector.hpp src/mathicgb/Atomic.hpp \
- src/mathicgb/FixedSizeMonomialMap.hpp src/mathicgb/CFile.hpp \
- src/mathicgb/CFile.cpp src/mathicgb/LogDomain.hpp \
- src/mathicgb/LogDomain.cpp src/mathicgb/LogDomainSet.hpp \
- src/mathicgb/F4MatrixBuilder2.hpp src/mathicgb/F4MatrixBuilder2.cpp \
- src/mathicgb/LogDomainSet.cpp src/mathicgb/F4ProtoMatrix.hpp \
- src/mathicgb/F4ProtoMatrix.cpp src/mathicgb/F4MatrixProject.hpp \
- src/mathicgb/F4MatrixProjection.cpp src/mathicgb/ScopeExit.hpp \
- src/mathicgb.cpp src/mathicgb.h src/mathicgb/mtbb.hpp \
- src/mathicgb/PrimeField.hpp src/mathicgb/MonoMonoid.hpp \
- src/mathicgb/MonoProcessor.hpp src/mathicgb/MonoOrder.hpp \
- src/mathicgb/Scanner.hpp src/mathicgb/Scanner.cpp \
- src/mathicgb/Unchar.hpp src/mathicgb/MathicIO.hpp \
+libmathicgb_la_SOURCES = src/mathicgb/BjarkeGeobucket2.cpp \
+ src/mathicgb/BjarkeGeobucket2.hpp src/mathicgb/BjarkeGeobucket.cpp \
+ src/mathicgb/BjarkeGeobucket.hpp src/mathicgb/ClassicGBAlg.cpp \
+ src/mathicgb/ClassicGBAlg.hpp src/mathicgb/ChainedHashTable.cpp \
+ src/mathicgb/ChainedHashTable.hpp src/mathicgb/MonoLookup.hpp \
+ src/mathicgb/MonoLookup.cpp src/mathicgb/StaticMonoMap.hpp \
+ src/mathicgb/SigPolyBasis.cpp src/mathicgb/SigPolyBasis.hpp \
+ src/mathicgb/HashTourReducer.cpp src/mathicgb/HashTourReducer.hpp \
+ src/mathicgb/Basis.cpp src/mathicgb/Basis.hpp \
+ src/mathicgb/io-util.cpp src/mathicgb/io-util.hpp \
+ src/mathicgb/KoszulQueue.hpp src/mathicgb/MonomialHashTable.hpp \
+ src/mathicgb/ModuleMonoSet.cpp src/mathicgb/ModuleMonoSet.hpp \
+ src/mathicgb/PairTriangle.cpp src/mathicgb/PairTriangle.hpp \
+ src/mathicgb/Poly.cpp src/mathicgb/Poly.hpp \
+ src/mathicgb/PolyBasis.cpp src/mathicgb/PolyBasis.hpp \
+ src/mathicgb/PolyGeoBucket.cpp src/mathicgb/PolyGeoBucket.hpp \
+ src/mathicgb/PolyHashReducer.cpp src/mathicgb/PolyHashReducer.hpp \
+ src/mathicgb/PolyHashTable.cpp src/mathicgb/PolyHashTable.hpp \
+ src/mathicgb/PolyHeap.cpp src/mathicgb/PolyHeap.hpp \
+ src/mathicgb/PolyReducer.cpp src/mathicgb/PolyReducer.hpp \
+ src/mathicgb/PolyRing.cpp src/mathicgb/PolyRing.hpp \
+ src/mathicgb/Reducer.cpp src/mathicgb/Reducer.hpp \
+ src/mathicgb/ReducerDedup.hpp src/mathicgb/ReducerHash.hpp \
+ src/mathicgb/ReducerHashPack.hpp src/mathicgb/ReducerHelper.hpp \
+ src/mathicgb/ReducerNoDedup.hpp src/mathicgb/ReducerPack.hpp \
+ src/mathicgb/ReducerPackDedup.hpp src/mathicgb/SignatureGB.cpp \
+ src/mathicgb/SignatureGB.hpp src/mathicgb/SigSPairs.cpp \
+ src/mathicgb/SigSPairs.hpp src/mathicgb/SPairs.cpp \
+ src/mathicgb/SPairs.hpp src/mathicgb/stdinc.h \
+ src/mathicgb/TournamentReducer.cpp \
+ src/mathicgb/TournamentReducer.hpp src/mathicgb/SigSPairQueue.hpp \
+ src/mathicgb/SigSPairQueue.cpp src/mathicgb/SparseMatrix.hpp \
+ src/mathicgb/SparseMatrix.cpp src/mathicgb/QuadMatrixBuilder.hpp \
+ src/mathicgb/QuadMatrixBuilder.cpp src/mathicgb/TypicalReducer.cpp \
+ src/mathicgb/TypicalReducer.hpp src/mathicgb/F4Reducer.hpp \
+ src/mathicgb/F4Reducer.cpp src/mathicgb/F4MatrixBuilder.hpp \
+ src/mathicgb/F4MatrixBuilder.cpp src/mathicgb/QuadMatrix.hpp \
+ src/mathicgb/QuadMatrix.cpp src/mathicgb/F4MatrixReducer.cpp \
+ src/mathicgb/F4MatrixReducer.hpp src/mathicgb/MonomialMap.hpp \
+ src/mathicgb/RawVector.hpp src/mathicgb/Atomic.hpp \
+ src/mathicgb/FixedSizeMonomialMap.hpp src/mathicgb/CFile.hpp \
+ src/mathicgb/CFile.cpp src/mathicgb/LogDomain.hpp \
+ src/mathicgb/LogDomain.cpp src/mathicgb/LogDomainSet.hpp \
+ src/mathicgb/F4MatrixBuilder2.hpp src/mathicgb/F4MatrixBuilder2.cpp \
+ src/mathicgb/LogDomainSet.cpp src/mathicgb/F4ProtoMatrix.hpp \
+ src/mathicgb/F4ProtoMatrix.cpp src/mathicgb/F4MatrixProject.hpp \
+ src/mathicgb/F4MatrixProjection.cpp src/mathicgb/ScopeExit.hpp \
+ src/mathicgb.cpp src/mathicgb.h src/mathicgb/mtbb.hpp \
+ src/mathicgb/PrimeField.hpp src/mathicgb/MonoMonoid.hpp \
+ src/mathicgb/MonoProcessor.hpp src/mathicgb/MonoOrder.hpp \
+ src/mathicgb/Scanner.hpp src/mathicgb/Scanner.cpp \
+ src/mathicgb/Unchar.hpp src/mathicgb/MathicIO.hpp \
src/mathicgb/NonCopyable.hpp
diff --git a/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj b/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj
index 9183042..8922e0a 100755
--- a/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj
+++ b/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj
@@ -456,8 +456,8 @@
<ClCompile Include="..\..\..\src\mathicgb\io-util.cpp" />
<ClCompile Include="..\..\..\src\mathicgb\LogDomain.cpp" />
<ClCompile Include="..\..\..\src\mathicgb\LogDomainSet.cpp" />
+ <ClCompile Include="..\..\..\src\mathicgb\ModuleMonoSet.cpp" />
<ClCompile Include="..\..\..\src\mathicgb\MonoLookup.cpp" />
- <ClCompile Include="..\..\..\src\mathicgb\MTArray.cpp" />
<ClCompile Include="..\..\..\src\mathicgb\PairTriangle.cpp" />
<ClCompile Include="..\..\..\src\mathicgb\Poly.cpp" />
<ClCompile Include="..\..\..\src\mathicgb\PolyBasis.cpp" />
@@ -502,13 +502,13 @@
<ClInclude Include="..\..\..\src\mathicgb\LogDomain.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\LogDomainSet.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\MathicIO.hpp" />
+ <ClInclude Include="..\..\..\src\mathicgb\ModuleMonoSet.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\MonoLookup.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\MonomialHashTable.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\MonomialMap.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\MonoMonoid.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\MonoOrder.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\MonoProcessor.hpp" />
- <ClInclude Include="..\..\..\src\mathicgb\MTArray.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\mtbb.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\NonCopyable.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\PairTriangle.hpp" />
@@ -540,7 +540,7 @@
<ClInclude Include="..\..\..\src\mathicgb\SigSPairs.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\SPairs.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\SparseMatrix.hpp" />
- <ClInclude Include="..\..\..\src\mathicgb\StaticMonoLookup.hpp" />
+ <ClInclude Include="..\..\..\src\mathicgb\StaticMonoMap.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\stdinc.h" />
<ClInclude Include="..\..\..\src\mathicgb\TournamentReducer.hpp" />
<ClInclude Include="..\..\..\src\mathicgb\TypicalReducer.hpp" />
diff --git a/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters b/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters
index 0a7f127..1f5d561 100755
--- a/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters
+++ b/build/vs12/mathicgb-lib/mathicgb-lib.vcxproj.filters
@@ -35,9 +35,6 @@
<ClCompile Include="..\..\..\src\mathicgb\io-util.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\src\mathicgb\MTArray.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\mathicgb\PairTriangle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -131,6 +128,9 @@
<ClCompile Include="..\..\..\src\mathicgb\MonoLookup.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\mathicgb\ModuleMonoSet.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\mathicgb\BjarkeGeobucket.hpp">
@@ -163,9 +163,6 @@
<ClInclude Include="..\..\..\src\mathicgb\MonomialHashTable.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\src\mathicgb\MTArray.hpp">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\src\mathicgb\PairTriangle.hpp">
<Filter>Header Files</Filter>
</ClInclude>
@@ -319,10 +316,13 @@
<ClInclude Include="..\..\..\src\mathicgb\Unchar.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\src\mathicgb\StaticMonoLookup.hpp">
+ <ClInclude Include="..\..\..\src\mathicgb\MonoLookup.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\src\mathicgb\MonoLookup.hpp">
+ <ClInclude Include="..\..\..\src\mathicgb\StaticMonoMap.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mathicgb\ModuleMonoSet.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
diff --git a/src/cli/GBCommonParams.cpp b/src/cli/GBCommonParams.cpp
index b77012d..9381134 100755
--- a/src/cli/GBCommonParams.cpp
+++ b/src/cli/GBCommonParams.cpp
@@ -3,7 +3,7 @@
#include "mathicgb/stdinc.h"
#include "GBCommonParams.hpp"
-#include "mathicgb/MTArray.hpp"
+#include "mathicgb/ModuleMonoSet.hpp"
#include "mathicgb/PolyReducer.hpp"
#include "mathicgb/MonoLookup.hpp"
@@ -70,7 +70,7 @@ GBCommonParams::GBCommonParams():
}
{
std::ostringstream monomialTableOut;
- MonomialTableArray::displayMTTypes(monomialTableOut);
+ ModuleMonoSet::displayMTTypes(monomialTableOut);
mMonomialTable.appendToDescription(monomialTableOut.str());
}
}
diff --git a/src/mathicgb/MTArray.cpp b/src/mathicgb/ModuleMonoSet.cpp
similarity index 91%
rename from src/mathicgb/MTArray.cpp
rename to src/mathicgb/ModuleMonoSet.cpp
index 3c888d4..cb7f977 100755
--- a/src/mathicgb/MTArray.cpp
+++ b/src/mathicgb/ModuleMonoSet.cpp
@@ -1,9 +1,9 @@
// 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 "MTArray.hpp"
+#include "ModuleMonoSet.hpp"
-#include "StaticMonoLookup.hpp"
+#include "StaticMonoMap.hpp"
#include "MathicIO.hpp"
MATHICGB_NAMESPACE_BEGIN
@@ -13,7 +13,7 @@ template<
bool AllowRemovals,
bool UseDivMask
>
-class ConcreteModuleMonoSet : public MonomialTableArray {
+class ConcreteModuleMonoSet : public ModuleMonoSet {
public:
typedef PolyRing::Monoid Monoid;
struct NoData {};
@@ -116,7 +116,7 @@ private:
Lookup* const mLookups;
};
-int MonomialTableArray::displayMTTypes(std::ostream &o)
+int ModuleMonoSet::displayMTTypes(std::ostream &o)
// returns n s.t. 0..n-1 are valid types
{
o << "Monomial table types:" << std::endl;
@@ -132,7 +132,7 @@ namespace {
public:
typedef PolyRing::Monoid Monoid;
- std::unique_ptr<MonomialTableArray> create(
+ std::unique_ptr<ModuleMonoSet> create(
const Monoid& monoid,
int type,
size_t componentCount,
@@ -140,7 +140,7 @@ namespace {
) {
const Params params = {monoid, type, componentCount};
return staticMonoLookupCreate
- <Create, std::unique_ptr<MonomialTableArray>>
+ <Create, std::unique_ptr<ModuleMonoSet>>
(type, allowRemovals, params);
}
@@ -153,7 +153,7 @@ namespace {
template<bool UseKDTree, bool AllowRemovals, bool UseDivMask>
struct Create {
- static std::unique_ptr<MonomialTableArray> create(const Params& params) {
+ static std::unique_ptr<ModuleMonoSet> create(const Params& params) {
return make_unique
<ConcreteModuleMonoSet<UseKDTree, AllowRemovals, UseDivMask>>
(params.monoid, params.componentCount);
@@ -162,7 +162,7 @@ namespace {
};
}
-std::unique_ptr<MonomialTableArray> MonomialTableArray::make
+std::unique_ptr<ModuleMonoSet> ModuleMonoSet::make
(const PolyRing *R, int typ, size_t components, bool allowRemovals)
{
return ModuleMonoSetFactory().create(R->monoid(), typ, components, allowRemovals);
diff --git a/src/mathicgb/MTArray.hpp b/src/mathicgb/ModuleMonoSet.hpp
similarity index 86%
rename from src/mathicgb/MTArray.hpp
rename to src/mathicgb/ModuleMonoSet.hpp
index 5ab0f52..734696b 100755
--- a/src/mathicgb/MTArray.hpp
+++ b/src/mathicgb/ModuleMonoSet.hpp
@@ -1,7 +1,7 @@
// 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_M_T_ARRAY_GUARD
-#define MATHICGB_M_T_ARRAY_GUARD
+#ifndef MATHICGB_MODULE_MONO_SET_GUARD
+#define MATHICGB_MODULE_MONO_SET_GUARD
#include "PolyRing.hpp"
#include <vector>
@@ -10,10 +10,10 @@
MATHICGB_NAMESPACE_BEGIN
-class MonomialTableArray
+class ModuleMonoSet
{
public:
- virtual ~MonomialTableArray() {};
+ virtual ~ModuleMonoSet() {};
// returns true if the monomial actually needs to be inserted.
// If the monomial is inserted, the caller agrees to keep that monomial
@@ -36,7 +36,7 @@ public:
// Choosing one
static int displayMTTypes(std::ostream &o); // returns n s.t. 0..n-1 are valid types
- static std::unique_ptr<MonomialTableArray>
+ static std::unique_ptr<ModuleMonoSet>
make(const PolyRing *R, int typ, size_t components, bool allowRemovals);
};
diff --git a/src/mathicgb/MonoLookup.cpp b/src/mathicgb/MonoLookup.cpp
index 6a3cf40..cd4d25e 100755
--- a/src/mathicgb/MonoLookup.cpp
+++ b/src/mathicgb/MonoLookup.cpp
@@ -4,7 +4,7 @@
#include "MonoLookup.hpp"
#include "SigPolyBasis.hpp"
-#include "StaticMonoLookup.hpp"
+#include "StaticMonoMap.hpp"
#include <mathic.h>
MATHICGB_NAMESPACE_BEGIN
diff --git a/src/mathicgb/SigSPairs.cpp b/src/mathicgb/SigSPairs.cpp
index f30c0d3..4b7e2f1 100755
--- a/src/mathicgb/SigSPairs.cpp
+++ b/src/mathicgb/SigSPairs.cpp
@@ -4,7 +4,7 @@
#include "SigSPairs.hpp"
#include "SigPolyBasis.hpp"
-#include "MTArray.hpp"
+#include "ModuleMonoSet.hpp"
#include "Reducer.hpp"
#include <limits>
#include <stdexcept>
@@ -15,7 +15,7 @@ MATHICGB_NAMESPACE_BEGIN
SigSPairs::SigSPairs(
const PolyRing *R0,
const SigPolyBasis *GB0,
- MonomialTableArray *Hsyz0,
+ ModuleMonoSet *Hsyz0,
Reducer* reducer,
bool postponeKoszuls,
bool useBaseDivisors,
diff --git a/src/mathicgb/SigSPairs.hpp b/src/mathicgb/SigSPairs.hpp
index 7518ad9..e3e9ce3 100755
--- a/src/mathicgb/SigSPairs.hpp
+++ b/src/mathicgb/SigSPairs.hpp
@@ -13,7 +13,7 @@
MATHICGB_NAMESPACE_BEGIN
class Poly;
-class MonomialTableArray;
+class ModuleMonoSet;
class SigPolyBasis;
class Reducer;
@@ -25,7 +25,7 @@ public:
SigSPairs(
const PolyRing *R0,
const SigPolyBasis *GB0,
- MonomialTableArray *Hsyz0,
+ ModuleMonoSet *Hsyz0,
Reducer* reducer,
bool postponeKoszuls,
bool useBaseDivisors,
@@ -117,7 +117,7 @@ private:
mathic::BitTriangle mKnownSyzygyTri;
// From elsewhere
- MonomialTableArray *Hsyz; // we often modify this
+ ModuleMonoSet *Hsyz; // we often modify this
const SigPolyBasis *GB;
Reducer* mReducer;
const bool mPostponeKoszuls;
diff --git a/src/mathicgb/SignatureGB.cpp b/src/mathicgb/SignatureGB.cpp
index f0d85f4..66ed14d 100755
--- a/src/mathicgb/SignatureGB.cpp
+++ b/src/mathicgb/SignatureGB.cpp
@@ -7,7 +7,7 @@
#include "MonoLookup.hpp"
#include "SigSPairs.hpp"
#include "PolyHeap.hpp"
-#include "MTArray.hpp"
+#include "ModuleMonoSet.hpp"
#include <mathic.h>
#include <limits>
@@ -41,8 +41,8 @@ SignatureGB::SignatureGB(
stats_nsecs(0.0),
GB(make_unique<SigPolyBasis>(R, divlookup_type, montable_type, preferSparseReducers)),
mKoszuls(R->monoid()),
- Hsyz(MonomialTableArray::make(R, montable_type, basis.size(), !mPostponeKoszul)),
- Hsyz2(MonomialTableArray::make(R, montable_type, basis.size(), !mPostponeKoszul)),
+ Hsyz(ModuleMonoSet::make(R, montable_type, basis.size(), !mPostponeKoszul)),
+ Hsyz2(ModuleMonoSet::make(R, montable_type, basis.size(), !mPostponeKoszul)),
reducer(Reducer::makeReducer(reductiontyp, *R)),
SP(make_unique<SigSPairs>(R, GB.get(), Hsyz.get(), reducer.get(), mPostponeKoszul, mUseBaseDivisors, useSingularCriterionEarly, queueType))
{
diff --git a/src/mathicgb/SignatureGB.hpp b/src/mathicgb/SignatureGB.hpp
index ffb860e..4429684 100755
--- a/src/mathicgb/SignatureGB.hpp
+++ b/src/mathicgb/SignatureGB.hpp
@@ -4,7 +4,7 @@
#define MATHICGB_SIGNATURE_G_B_GUARD
#include "PolyRing.hpp"
-#include "MTArray.hpp"
+#include "ModuleMonoSet.hpp"
#include "SigPolyBasis.hpp"
#include "SigSPairs.hpp"
#include "Reducer.hpp"
@@ -45,7 +45,7 @@ public:
unsigned long long getSingularReductionCount() const;
SigPolyBasis* getGB() { return GB.get(); }
- MonomialTableArray* getSyzTable() { return mProcessor->processingNeeded() ? Hsyz2.get() : Hsyz.get(); }
+ ModuleMonoSet* getSyzTable() { return mProcessor->processingNeeded() ? Hsyz2.get() : Hsyz.get(); }
SigSPairs* getSigSPairs() { return SP.get(); }
size_t getMemoryUse() const;
@@ -99,8 +99,8 @@ private:
std::unique_ptr<SigPolyBasis> GB;
KoszulQueue mKoszuls;
- std::unique_ptr<MonomialTableArray> Hsyz;
- std::unique_ptr<MonomialTableArray> Hsyz2;
+ std::unique_ptr<ModuleMonoSet> Hsyz;
+ std::unique_ptr<ModuleMonoSet> Hsyz2;
std::unique_ptr<Reducer> reducer;
std::unique_ptr<SigSPairs> SP;
std::unique_ptr<MonoProcessor<Monoid>> mProcessor;
diff --git a/src/mathicgb/StaticMonoLookup.hpp b/src/mathicgb/StaticMonoMap.hpp
similarity index 100%
rename from src/mathicgb/StaticMonoLookup.hpp
rename to src/mathicgb/StaticMonoMap.hpp
diff --git a/src/mathicgb/io-util.cpp b/src/mathicgb/io-util.cpp
index ced638e..76c59ff 100755
--- a/src/mathicgb/io-util.cpp
+++ b/src/mathicgb/io-util.cpp
@@ -4,7 +4,7 @@
#include "io-util.hpp"
#include "Poly.hpp"
-#include "MTArray.hpp"
+#include "ModuleMonoSet.hpp"
#include "io-util.hpp"
#include "Scanner.hpp"
#include "MathicIO.hpp"
@@ -12,7 +12,6 @@
#include "PolyGeoBucket.hpp"
#include "SigPolyBasis.hpp"
#include "SignatureGB.hpp"
-#include "MTArray.hpp"
#include "Basis.hpp"
#include "PolyBasis.hpp"
#include <cstdio>
@@ -104,7 +103,7 @@ std::string toString(SigPolyBasis *I, int)
return o.str();
}
-std::string toString(MonomialTableArray* H)
+std::string toString(ModuleMonoSet* H)
{
std::ostringstream o;
H->display(o);
diff --git a/src/mathicgb/io-util.hpp b/src/mathicgb/io-util.hpp
index 7410331..15f71be 100755
--- a/src/mathicgb/io-util.hpp
+++ b/src/mathicgb/io-util.hpp
@@ -9,7 +9,7 @@ MATHICGB_NAMESPACE_BEGIN
class Poly;
class SigPolyBasis;
-class MonomialTableArray;
+class ModuleMonoSet;
class PolyBasis;
class Basis;
@@ -23,7 +23,7 @@ Monomial stringToMonomial(const PolyRing *R, std::string mon);
std::string monomialToString(const PolyRing *R, const Monomial& mon);
std::string toString(SigPolyBasis *);
-std::string toString(MonomialTableArray *);
+std::string toString(ModuleMonoSet *);
std::string toString(SigPolyBasis *, int unused); // also displays signature
std::string toString(Basis *);
std::string toString(const Poly *);
diff --git a/src/test/gb-test.cpp b/src/test/gb-test.cpp
index 7096646..5bc3629 100755
--- a/src/test/gb-test.cpp
+++ b/src/test/gb-test.cpp
@@ -4,7 +4,7 @@
#include "mathicgb/Poly.hpp"
#include "mathicgb/Basis.hpp"
-#include "mathicgb/MTArray.hpp"
+#include "mathicgb/ModuleMonoSet.hpp"
#include "mathicgb/io-util.hpp"
#include "mathicgb/PolyHeap.hpp"
#include "mathicgb/SigPolyBasis.hpp"
diff --git a/src/test/poly-test.cpp b/src/test/poly-test.cpp
index 518e299..4f695b8 100755
--- a/src/test/poly-test.cpp
+++ b/src/test/poly-test.cpp
@@ -4,7 +4,7 @@
#include "mathicgb/Poly.hpp"
#include "mathicgb/Basis.hpp"
-#include "mathicgb/MTArray.hpp"
+#include "mathicgb/ModuleMonoSet.hpp"
#include "mathicgb/io-util.hpp"
#include "mathicgb/MonomialHashTable.hpp"
#include "mathicgb/PolyHashTable.hpp"
@@ -504,7 +504,7 @@ TEST(Coeff, addone) {
TEST(MTArray,DivList1) {
// We create a table here
std::unique_ptr<PolyRing> R(ringFromString("32003 6 1\n1 1 1 1 1 1"));
- auto M = MonomialTableArray::make(R.get(), 1, 6, false);
+ auto M = ModuleMonoSet::make(R.get(), 1, 6, false);
std::string mons[2] = {
"abc<1>",
"a2d<1>"
@@ -528,7 +528,7 @@ TEST(MTArray,DivList1) {
TEST(MTArray,KDTree1) {
// We create a table here
std::unique_ptr<PolyRing> R(ringFromString("32003 6 1\n1 1 1 1 1 1"));
- std::unique_ptr<MonomialTableArray> M(MonomialTableArray::make(R.get(), 2, 6, false));
+ std::unique_ptr<ModuleMonoSet> M(ModuleMonoSet::make(R.get(), 2, 6, false));
std::string mons[2] = {
"abc<1>",
"a2d<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