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

Remove lst and fam vector from RelTable, replace with lst_ptr vector. fam is identified by the pointer value, and lst is identified by referencing the pointer.

Browse Source
This commit is contained in:
JCRaymond
2019-12-25 01:01:22 -05:00
parent 8f82531a72
commit d2dd002965
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
solver.cpp
View File

@@ -47,7 +47,8 @@ struct Mult {
struct RelTable { struct RelTable {
int gens[2]; int gens[2];
int mult; int mult;
std::vector<int> fam, gen, lst; std::vector<int*> lst_ptr;
std::vector<int> gen;
RelTable(Mult m): mult(m.mult) { RelTable(Mult m): mult(m.mult) {
gens[0] = m.gen0; gens[0] = m.gen0;
@@ -55,10 +56,9 @@ struct RelTable {
} }
int add_row() { int add_row() {
int idx = fam.size(); int idx = lst_ptr.size();
fam.push_back(-1); lst_ptr.push_back(nullptr);
gen.push_back(-1); gen.push_back(-1);
lst.push_back(-1);
return idx; return idx;
} }
}; };
@@ -148,14 +148,16 @@ struct Group {
rel_tables.emplace_back(m); rel_tables.emplace_back(m);
} }
int null_lst_ptr;
for (RelTable &rel : rel_tables) { for (RelTable &rel : rel_tables) {
int idx = rel.add_row(); int idx = rel.add_row();
rel.fam[idx] = 0; if (cosets.get(rel.gens[0]) + cosets.get(rel.gens[1]) == -2) {
rel.lst_ptr[idx] = new int;
rel.gen[idx] = 0; rel.gen[idx] = 0;
rel.lst[idx] = 0; }
else {
if ( (cosets.get(rel.gens[0]) == 0) xor (cosets.get(rel.gens[1]) == 0) ) { rel.lst_ptr[idx] = &null_lst_ptr;
rel.gen[idx] = -1; rel.gen[idx] = -1;
} }
} }
@@ -196,15 +198,16 @@ struct Group {
for (int rel_idx : gen_map[gen]) { for (int rel_idx : gen_map[gen]) {
RelTable &rel = rel_tables[rel_idx]; RelTable &rel = rel_tables[rel_idx];
if ( rel.fam[target] == -1 ) { if ( rel.lst_ptr[target] == nullptr ) {
rel.fam[target] = rel.fam[coset]; rel.lst_ptr[target] = rel.lst_ptr[coset];
rel.gen[target] = rel.gen[coset] + 1; rel.gen[target] = rel.gen[coset] + 1;
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) {
lst = rel.lst[rel.fam[target]]; lst = *(rel.lst_ptr[target]);
delete rel.lst_ptr[target];
gen_ = rel.gens[(int)(rel.gens[0] == gen)]; gen_ = rel.gens[(int)(rel.gens[0] == gen)];
facts.push_back(lst*ngens + gen_); facts.push_back(lst*ngens + gen_);
} }
@@ -213,7 +216,7 @@ struct Group {
facts.push_back(target*ngens + gen_); facts.push_back(target*ngens + gen_);
} }
else if (rel.gen[target] == rel.mult - 1) { else if (rel.gen[target] == rel.mult - 1) {
rel.lst[rel.fam[target]] = target; *(rel.lst_ptr[target]) = target;
} }
} }
} }
@@ -222,15 +225,19 @@ struct Group {
} }
for (RelTable &rel : rel_tables) { for (RelTable &rel : rel_tables) {
if (rel.fam[target] == -1) { if (rel.lst_ptr[target] == nullptr) {
rel.fam[target] = target; if ( (cosets.get(target, rel.gens[0]) != target) and
(cosets.get(target, rel.gens[1]) != target) ) {
rel.lst_ptr[target] = new int;
rel.gen[target] = 0; rel.gen[target] = 0;
}
if ( (cosets.get(target, rel.gens[0]) == target) xor (cosets.get(target, rel.gens[1]) == target) ) else {
rel.lst_ptr[target] = &null_lst_ptr;
rel.gen[target] = -1; rel.gen[target] = -1;
} }
} }
} }
}
return cosets; return cosets;
} }

2
test.cpp
View File

@@ -3,7 +3,7 @@
#include <iostream> #include <iostream>
int main() { int main() {
Group g = B(9); Group g = T(4500);
auto s = std::chrono::system_clock::now(); auto s = std::chrono::system_clock::now();
auto cosets = g.solve(); auto cosets = g.solve();