ENH: Use Eigen for mirrors

vis/include/mirror.hpp

@@ -8,50 +8,23 @@
 
 #include <geometry.hpp>
 
-template<class V>
+template<unsigned int N>
-float dot(int n, const V &a, const V &b) {
+Eigen::Matrix<float, N, N> mirror(const tc::Group<> &group) {
-    float sum = 0;
+    Eigen::Matrix<float, N, N> res;
-    for (int i = 0; i < n; ++i) {
+    res.setZero();
-        sum += a[i] * b[i];
+
-    }
+    for (int c = 0; c < group.rank(); ++c) {
-    return sum;
+        for (int r = 0; r < c; ++r) {
+            auto angle = M_PI / group.get(c, r);
+            auto dot = res.col(c).dot(res.col(r));
+
+            res(r, c) = (cos(angle) - dot) / res(r, r);
         }
 
-template<unsigned N>
+        res(c, c) = sqrt(1 - res.col(c).squaredNorm());
-std::vector<vec<N>> mirror(const tc::Group<> &group) {
+        res.col(c) *= -1;
-    std::vector<std::vector<float>> mirrors;
-
-    for (int p = 0; p < group.rank(); ++p) {
-        std::vector<float> vp;
-        for (int m = 0; m < p; ++m) {
-            auto &vq = mirrors[m];
-            vp.push_back((cos(M_PI / group.get(p, m)) - dot(m, vp, vq)) / vq[m]);
-        }
-        vp.push_back(std::sqrt(1 - dot(p, vp, vp)));
-
-        for (const auto &v : mirrors) {
-            if (dot(p, vp, vp) > 0) {
-                for (auto &e : vp) {
-                    e *= -1;
-                }
-                break;
-            }
     }
 
-        mirrors.push_back(vp);
-    }
-
-    std::vector<vec<N>> res;
-    for (const auto &v : mirrors) {
-        vec<N> rv = vec<N>::Zero();
-
-        // ortho proj
-        for (int i = 0; i < std::min(v.size(), (size_t) N); ++i) {
-            rv[i] = v[i];
-        }
-
-        res.push_back(rv);
-    }
     return res;
 }
 
@@ -83,36 +56,41 @@ V reflect(const V &a, const V &axis) {
     return a - 2.f * project(a, axis);
 }
 
-template<class V>
+template<class Point, class Axis>
-V gram_schmidt_last(std::vector<V> vecs) {
+auto project_(const Point &point, const Axis &axis) {
-    for (int i = 0; i < vecs.size(); ++i) {
+    return axis.dot(point) / axis.dot(axis) * axis;
-        for (int j = 0; j < i; ++j) {
-            vecs[i] -= project(vecs[i], vecs[j]);
-        }
 }
 
-    return vecs[vecs.size() - 1].normalized();
+template<class Mat>
+Mat gram_schmidt(Mat mat) {
+    for (int i = 0; i < mat.cols(); ++i) {
+        for (int j = i + 1; j < mat.cols(); ++j) {
+            mat.col(j) -= project_(mat.col(j), mat.col(i));
+        }
+    }
+    return mat;
 }
 
-template<class V, class C>
+template<class Mat>
-V barycentric(const std::vector<V> &basis, const C &coords) {
+Mat plane_intersections(Mat normals) {
-    V res = V::Zero();
+    auto last = normals.cols() - 1;
 
-    int N = std::min((int) basis.size(), (int) coords.rows());
+    Mat results(normals.rows(), normals.cols());
-    for (int i = 0; i < N; ++i) {
+    results.setZero();
-        res += basis[i] * coords[i];
+
-    }
+    Eigen::Matrix<int, Mat::ColsAtCompileTime, 1> indices(normals.cols());
-    return res;
+    std::iota(indices.begin(), indices.end(), 0);
+
+    for (int i = 0; i < normals.cols(); ++i) {
+        std::rotate(indices.begin(), indices.begin() + 1, indices.end());
+
+        Mat cur = normals * Eigen::PermutationMatrix<Mat::ColsAtCompileTime>(indices);
+        Mat res = gram_schmidt(cur);
+
+        results.col(i) = res.col(last);
     }
 
-template<class V>
+    results.colwise().normalize();
-std::vector<V> plane_intersections(std::vector<V> normals) {
-    std::vector<V> results(normals.size());
-
-    for (int i = 0; i < normals.size(); ++i) {
-        std::rotate(normals.begin(), normals.begin() + 1, normals.end());
-        results[i] = gram_schmidt_last(normals);
-    }
 
     return results;
 }

vis/src/main.cpp

@@ -83,12 +83,12 @@ template<class C>
 std::vector<vec4> points(const tc::Group<> &group, const C &coords) {
     auto cosets = group.solve();
     auto mirrors = mirror<5>(group);
-
-    tc::Path<vec5> path(cosets, mirrors);
-
     auto corners = plane_intersections(mirrors);
 
-    auto start = barycentric(corners, coords);
+    vec5 coord = coords;
+    auto start = corners * coord;
+
+    tc::Path<vec5> path(cosets, mirrors.colwise());
 
     std::vector<vec5> higher(path.order());
     path.walk(start, reflect<vec5>, higher.begin());