allemang.d/toddcox-visualize
1
0
Fork 0
mirror of https://github.com/allemangD/toddcox-visualize.git synced 2025-11-10 12:02:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

introduce RelationSet, fix namespace for groups.cpp/.h

Browse Source
This commit is contained in:
David Allemang
2019-12-27 21:58:15 -05:00
parent 3aae0b5286
commit 873102a8c3
6 changed files with 95 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
example/bench.cpp
View File

@@ -4,7 +4,8 @@
#include <iostream> #include <iostream>
int main() { int main() {
tc::Group g = tc::group::T(2, 5000); tc::Group g = tc::group::H(4);
// tc::Group g = tc::group::T(2, 5000);
auto s = std::chrono::system_clock::now(); auto s = std::chrono::system_clock::now();
auto cosets = solve(g); auto cosets = solve(g);

40
include/cosets.h
View File

@@ -3,31 +3,33 @@
#include "groups.h" #include "groups.h"
#include <vector> #include <vector>
struct Cosets { namespace tc {
int ngens; struct Cosets {
std::vector<int> data; int ngens;
int len; std::vector<int> data;
int len;
Cosets(int ngens, const std::vector<int> &data); Cosets(int ngens, const std::vector<int> &data);
void add_row(); void add_row();
void put(int coset, int gen, int target); void put(int coset, int gen, int target);
void put(int idx, int target); void put(int idx, int target);
[[nodiscard]] int get(int coset, int gen) const; [[nodiscard]] int get(int coset, int gen) const;
[[nodiscard]] int get(int idx) const; [[nodiscard]] int get(int idx) const;
}; };
struct RelTable { struct RelTable {
int gens[2]{}; Mult mult;
int mult;
std::vector<int *> lst_ptr;
std::vector<int> gen;
explicit RelTable(tc::Mult m); std::vector<int *> lst_ptr;
std::vector<int> gen;
int add_row(); explicit RelTable(tc::Mult m);
};
int add_row();
};
}

4
include/groups.h
View File

@@ -1,10 +1,12 @@
#pragma once #pragma once
#include <array>
#include <vector> #include <vector>
namespace tc { namespace tc {
struct Mult { struct Mult {
int gen0, gen1, mult; std::array<int, 2> gens;
int mult;
}; };
struct Group { struct Group {

64
src/cosets.cpp
View File

@@ -1,42 +1,42 @@
#include "cosets.h" #include "cosets.h"
Cosets::Cosets(int ngens, const std::vector<int> &data) : ngens(ngens), data(data) { namespace tc {
len = data.size() / ngens; Cosets::Cosets(int ngens, const std::vector<int> &data) : ngens(ngens), data(data) {
} len = data.size() / ngens;
}
void Cosets::add_row() { void Cosets::add_row() {
len++; len++;
data.resize(data.size() + ngens, -1); data.resize(data.size() + ngens, -1);
} }
void Cosets::put(int coset, int gen, int target) { void Cosets::put(int coset, int gen, int target) {
data[coset * ngens + gen] = target; data[coset * ngens + gen] = target;
data[target * ngens + gen] = coset; data[target * ngens + gen] = coset;
} }
void Cosets::put(int idx, int target) { void Cosets::put(int idx, int target) {
int coset = idx / ngens; int coset = idx / ngens;
int gen = idx % ngens; int gen = idx % ngens;
data[idx] = target; data[idx] = target;
data[target * ngens + gen] = coset; data[target * ngens + gen] = coset;
} }
int Cosets::get(int coset, int gen) const { int Cosets::get(int coset, int gen) const {
return data[coset * ngens + gen]; return data[coset * ngens + gen];
} }
int Cosets::get(int idx) const { int Cosets::get(int idx) const {
return data[idx]; return data[idx];
} }
RelTable::RelTable(tc::Mult m) : mult(m.mult) { RelTable::RelTable(tc::Mult m) : mult(m) {
gens[0] = m.gen0; }
gens[1] = m.gen1;
}
int RelTable::add_row() { int RelTable::add_row() {
int idx = lst_ptr.size(); int idx = lst_ptr.size();
lst_ptr.push_back(nullptr); lst_ptr.push_back(nullptr);
gen.push_back(-1); gen.push_back(-1);
return idx; return idx;
}
} }

16
src/groups.cpp
View File

@@ -8,18 +8,18 @@ namespace tc {
} }
for (Mult m : rels) { for (Mult m : rels) {
if (m.gen0 < m.gen1) if (m.gens[0] < m.gens[1])
_mults[m.gen0][m.gen1] = m.mult; _mults[m.gens[0]][m.gens[1]] = m.mult;
else else
_mults[m.gen1][m.gen0] = m.mult; _mults[m.gens[1]][m.gens[0]] = m.mult;
} }
} }
void Group::setmult(Mult m) { void Group::setmult(Mult m) {
if (m.gen0 < m.gen1) if (m.gens[0] < m.gens[1])
_mults[m.gen0][m.gen1] = m.mult; _mults[m.gens[0]][m.gens[1]] = m.mult;
else else
_mults[m.gen1][m.gen0] = m.mult; _mults[m.gens[1]][m.gens[0]] = m.mult;
} }
std::vector<Mult> Group::get_mults() const { std::vector<Mult> Group::get_mults() const {
@@ -38,7 +38,7 @@ namespace tc {
Group g(ngens + other.ngens, get_mults()); Group g(ngens + other.ngens, get_mults());
for (Mult m : other.get_mults()) { for (Mult m : other.get_mults()) {
g.setmult({off + m.gen0, off + m.gen1, m.mult}); g.setmult({off + m.gens[0], off + m.gens[1], m.mult});
} }
return g; return g;
@@ -49,7 +49,7 @@ namespace tc {
for (Mult m : get_mults()) { for (Mult m : get_mults()) {
for (int off = 0; off < g.ngens; off += ngens) { for (int off = 0; off < g.ngens; off += ngens) {
g.setmult({off + m.gen0, off + m.gen1, m.mult}); g.setmult({off + m.gens[0], off + m.gens[1], m.mult});
} }
} }

55
src/solver.cpp
View File

@@ -1,9 +1,23 @@
#include "solver.h" #include "solver.h"
#include <algorithm> #include <algorithm>
#include <functional>
namespace tc { namespace tc {
struct RelationSet {
std::vector<RelTable> tables;
std::vector<std::vector<RelTable *>> gen_map; // which relations involve which generators
explicit RelationSet(const Group &g) : gen_map(g.ngens) {
const std::vector<Mult> &mults = g.get_mults();
tables.reserve(mults.size());
for (const auto &mult : mults) {
RelTable &table = tables.emplace_back(mult);
gen_map[mult.gens[0]].push_back(&table);
gen_map[mult.gens[1]].push_back(&table);
}
}
};
Cosets solve(const Group &group, const std::vector<int> &sub_gens) { Cosets solve(const Group &group, const std::vector<int> &sub_gens) {
std::vector<int> init_row(group.ngens, -1); std::vector<int> init_row(group.ngens, -1);
for (int i : sub_gens) { for (int i : sub_gens) {
@@ -11,21 +25,13 @@ namespace tc {
} }
Cosets cosets(group.ngens, init_row); Cosets cosets(group.ngens, init_row);
std::vector<RelTable> rel_tables; RelationSet rels(group);
std::vector<std::vector<int>> gen_map(group.ngens);
int rel_idx;
for (Mult m : group.get_mults()) {
rel_idx = rel_tables.size();
gen_map[m.gen0].push_back(rel_idx);
gen_map[m.gen1].push_back(rel_idx);
rel_tables.emplace_back(m);
}
int null_lst_ptr; int null_lst_ptr;
for (RelTable &rel : rel_tables) { for (RelTable &rel : rels.tables) {
int idx = rel.add_row(); int idx = rel.add_row();
if (cosets.get(rel.gens[0]) + cosets.get(rel.gens[1]) == -2) { if (cosets.get(rel.mult.gens[0]) + cosets.get(rel.mult.gens[1]) == -2) {
rel.lst_ptr[idx] = new int; rel.lst_ptr[idx] = new int;
rel.gen[idx] = 0; rel.gen[idx] = 0;
} else { } else {
@@ -46,16 +52,13 @@ namespace tc {
target = cosets.len; target = cosets.len;
cosets.add_row(); cosets.add_row();
for (RelTable &rel : rel_tables) { for (RelTable &rel : rels.tables) {
rel.add_row(); rel.add_row();
} }
std::vector<int> facts; std::vector<int> facts;
facts.push_back(idx); facts.push_back(idx);
coset = idx / group.ngens;
gen = idx % group.ngens;
while (!facts.empty()) { while (!facts.empty()) {
fact_idx = facts.back(); fact_idx = facts.back();
facts.pop_back(); facts.pop_back();
@@ -68,8 +71,8 @@ namespace tc {
coset = fact_idx / group.ngens; coset = fact_idx / group.ngens;
gen = fact_idx % group.ngens; gen = fact_idx % group.ngens;
for (int rel_idx : gen_map[gen]) { for (RelTable *rel_idx : rels.gen_map[gen]) {
RelTable &rel = rel_tables[rel_idx]; RelTable &rel = *rel_idx;
if (rel.lst_ptr[target] == nullptr) { if (rel.lst_ptr[target] == nullptr) {
rel.lst_ptr[target] = rel.lst_ptr[coset]; rel.lst_ptr[target] = rel.lst_ptr[coset];
rel.gen[target] = rel.gen[coset] + 1; rel.gen[target] = rel.gen[coset] + 1;
@@ -77,15 +80,15 @@ namespace tc {
if (rel.gen[coset] < 0) if (rel.gen[coset] < 0)
rel.gen[target] -= 2; rel.gen[target] -= 2;
if (rel.gen[target] == rel.mult) { if (rel.gen[target] == rel.mult.mult) {
lst = *(rel.lst_ptr[target]); lst = *(rel.lst_ptr[target]);
delete rel.lst_ptr[target]; delete rel.lst_ptr[target];
gen_ = rel.gens[(int) (rel.gens[0] == gen)]; gen_ = rel.mult.gens[(int) (rel.mult.gens[0] == gen)];
facts.push_back(lst * group.ngens + gen_); facts.push_back(lst * group.ngens + gen_);
} else if (rel.gen[target] == -rel.mult) { } else if (rel.gen[target] == -rel.mult.mult) {
gen_ = rel.gens[rel.gens[0] == gen]; gen_ = rel.mult.gens[rel.mult.gens[0] == gen];
facts.push_back(target * group.ngens + gen_); facts.push_back(target * group.ngens + gen_);
} else if (rel.gen[target] == rel.mult - 1) { } else if (rel.gen[target] == rel.mult.mult - 1) {
*(rel.lst_ptr[target]) = target; *(rel.lst_ptr[target]) = target;
} }
} }
@@ -94,10 +97,10 @@ namespace tc {
std::sort(facts.begin(), facts.end(), std::greater<>()); std::sort(facts.begin(), facts.end(), std::greater<>());
} }
for (RelTable &rel : rel_tables) { for (RelTable &rel : rels.tables) {
if (rel.lst_ptr[target] == nullptr) { if (rel.lst_ptr[target] == nullptr) {
if ((cosets.get(target, rel.gens[0]) != target) and if ((cosets.get(target, rel.mult.gens[0]) != target) and
(cosets.get(target, rel.gens[1]) != target)) { (cosets.get(target, rel.mult.gens[1]) != target)) {
rel.lst_ptr[target] = new int; rel.lst_ptr[target] = new int;
rel.gen[target] = 0; rel.gen[target] = 0;
} else { } else {