me/toddcox-faster
1
0
Fork 0
forked from mirror/toddcox-faster
Code Pull Requests Activity

add context group to tc::Path and tc::Cosets

Browse Source
This commit is contained in:
David Allemang
2020-01-19 21:48:21 -05:00
parent 7afa9e0b36
commit f29724a185
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core.cpp
View File

@@ -9,6 +9,10 @@ namespace tc {
: from_idx(from_idx), gen(gen) {
}
Path::Path(const tc::Group &context)
: context(context), path() {
}
void Path::add_row() {
path.resize(path.size() + 1);
}
@@ -25,18 +29,18 @@ namespace tc {
return path.size();
}
Cosets::Cosets(int ngens)
: ngens(ngens) {
Cosets::Cosets(const tc::Group &context)
: path(context), context(context), data() {
}
void Cosets::add_row() {
data.resize(data.size() + ngens, -1);
data.resize(data.size() + context.ngens, -1);
path.add_row();
}
void Cosets::put(int coset, int gen, int target) {
data[coset * ngens + gen] = target;
data[target * ngens + gen] = coset;
data[coset * context.ngens + gen] = target;
data[target * context.ngens + gen] = coset;
if (path.get(target).from_idx == -1) {
path.put(coset, gen, target);
@@ -44,10 +48,10 @@ namespace tc {
}
void Cosets::put(int idx, int target) {
int coset = idx / ngens;
int gen = idx % ngens;
int coset = idx / context.ngens;
int gen = idx % context.ngens;
data[idx] = target;
data[target * ngens + gen] = coset;
data[target * context.ngens + gen] = coset;
if (path.get(target).from_idx == -1) {
path.put(coset, gen, target);
@@ -55,7 +59,7 @@ namespace tc {
}
int Cosets::get(int coset, int gen) const {
return data[coset * ngens + gen];
return data[coset * context.ngens + gen];
}
int Cosets::get(int idx) const {

2
src/solve.cpp
View File

@@ -65,7 +65,7 @@ namespace tc {
};
Cosets Group::solve(const std::vector<int> &sub_gens) const {
Cosets cosets(ngens);
Cosets cosets(*this);
cosets.add_row();
if (ngens == 0) {