renamed hrmap_rotation_space::relative_matrix to adj

This commit is contained in:
Zeno Rogue 2019-11-30 16:03:31 +01:00
parent f69ea5ec8d
commit c3b12328e0
1 changed files with 4 additions and 4 deletions

View File

@ -1776,7 +1776,7 @@ EX namespace rots {
std::unordered_map<int, transmatrix> saved_matrices; std::unordered_map<int, transmatrix> saved_matrices;
transmatrix get_relative_matrix(cell *c1, int i) { transmatrix adj(cell *c1, int i) override {
if(i == c1->type-2) return uzpush(-cgi.plevel) * spin(-2*cgi.plevel); if(i == c1->type-2) return uzpush(-cgi.plevel) * spin(-2*cgi.plevel);
if(i == c1->type-1) return uzpush(+cgi.plevel) * spin(+2*cgi.plevel); if(i == c1->type-1) return uzpush(+cgi.plevel) * spin(+2*cgi.plevel);
cell *c2 = c1->cmove(i); cell *c2 = c1->cmove(i);
@ -1797,7 +1797,7 @@ EX namespace rots {
transmatrix Spin; transmatrix Spin;
cell *cw = where[c1].first; cell *cw = where[c1].first;
in_underlying([&] { in_underlying([&] {
transmatrix T = adj(cw, i); transmatrix T = currentmap->adj(cw, i);
hyperpoint h = tC0(T); hyperpoint h = tC0(T);
Spin = inverse(gpushxto0(h) * T); Spin = inverse(gpushxto0(h) * T);
d = hr::inverse_exp(h, iTable); d = hr::inverse_exp(h, iTable);
@ -1813,7 +1813,7 @@ EX namespace rots {
if(c1 == c2) return Id; if(c1 == c2) return Id;
if(gmatrix0.count(c2) && gmatrix0.count(c1)) if(gmatrix0.count(c2) && gmatrix0.count(c1))
return inverse(gmatrix0[c1]) * gmatrix0[c2]; return inverse(gmatrix0[c1]) * gmatrix0[c2];
for(int i=0; i<c1->type; i++) if(c1->move(i) == c2) return get_relative_matrix(c1, i); for(int i=0; i<c1->type; i++) if(c1->move(i) == c2) return adj(c1, i);
return Id; // not implemented yet return Id; // not implemented yet
} }
@ -1844,7 +1844,7 @@ EX namespace rots {
cell *c1 = c->cmove(i); cell *c1 = c->cmove(i);
if(visited.count(c1)) continue; if(visited.count(c1)) continue;
visited.insert(c1); visited.insert(c1);
dq.emplace_back(c1, V * get_relative_matrix(c, i)); dq.emplace_back(c1, V * adj(c, i));
} }
} }
} }