split "cosets" and "solver" data. "solver.cpp" now only for solution logic.

This commit is contained in:
2019-12-27 17:06:25 -05:00
parent c489d530a9
commit 96b27cd642
5 changed files with 78 additions and 74 deletions

View File

@@ -3,7 +3,7 @@ project(tc)
set(CMAKE_CXX_STANDARD 17)
add_library(tc STATIC src/groups.cpp src/solver.cpp)
add_library(tc STATIC src/groups.cpp src/solver.cpp src/cosets.cpp)
target_include_directories(tc PUBLIC include)
add_subdirectory(example)

33
include/cosets.h Normal file
View File

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

View File

@@ -1,37 +1,7 @@
#pragma once
#include "groups.h"
#include <vector>
#include "cosets.h"
namespace tc {
struct Cosets {
int ngens;
std::vector<int> data;
int len;
Cosets(int ngens, const std::vector<int> &data);
void add_row();
void put(int coset, int gen, int target);
void put(int idx, int target);
[[nodiscard]] int get(int coset, int gen) const;
[[nodiscard]] int get(int idx) const;
};
struct RelTable {
int gens[2]{};
int mult;
std::vector<int *> lst_ptr;
std::vector<int> gen;
explicit RelTable(Mult m);
int add_row();
};
Cosets solve(const Group &g, const std::vector<int> &sub_gens = {});
}
}

42
src/cosets.cpp Normal file
View File

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

View File

@@ -4,47 +4,6 @@
#include <functional>
namespace tc {
Cosets::Cosets(int ngens, const std::vector<int> &data) : ngens(ngens), data(data) {
len = data.size() / ngens;
}
void Cosets::add_row() {
len++;
data.resize(data.size() + ngens, -1);
}
void Cosets::put(int coset, int gen, int target) {
data[coset * ngens + gen] = target;
data[target * ngens + gen] = coset;
}
void Cosets::put(int idx, int target) {
int coset = idx / ngens;
int gen = idx % ngens;
data[idx] = target;
data[target * ngens + gen] = coset;
}
int Cosets::get(int coset, int gen) const {
return data[coset * ngens + gen];
}
int Cosets::get(int idx) const {
return data[idx];
}
RelTable::RelTable(Mult m) : mult(m.mult) {
gens[0] = m.gen0;
gens[1] = m.gen1;
}
int RelTable::add_row() {
int idx = lst_ptr.size();
lst_ptr.push_back(nullptr);
gen.push_back(-1);
return idx;
}
Cosets solve(const Group &group, const std::vector<int> &sub_gens) {
std::vector<int> init_row(group.ngens, -1);
for (int i : sub_gens) {