Refactor

Author: rjc8237

include/holonomy/holonomy/core/VF_mesh.h

@@ -1,9 +1,10 @@
 #pragma once
 
 #include "holonomy/core/common.h"
-#include "holonomy/core/spanning_tree.h"
+#include "util/spanning_tree.h"
 
-namespace PennerHolonomy {
+namespace Penner {
+namespace Holonomy {
 
 /**
  * @brief Class to generate boundary loops and boundary path basis loops
@@ -55,4 +56,5 @@ class BoundaryBasisGenerator
     DualTree m_dual_tree;
 };
 
-} // namespace PennerHolonomy
+} // namespace Holonomy
+} // namespace Penner

include/holonomy/holonomy/core/boundary_basis.h

@@ -9,27 +9,15 @@
 #include <Eigen/Sparse>
 
 #include "optimization/penner_optimization_interface.h"
+#include "optimization/core/common.h"
 #include "optimization/core/cone_metric.h"
-#include "optimization/core/vector.h"
+#include "util/vector.h"
 
-namespace PennerHolonomy {
+namespace Penner {
+namespace Holonomy {
 
 // Typedefs
-using CurvatureMetric::DifferentiableConeMetric;
-using CurvatureMetric::float_equal;
-using CurvatureMetric::MatrixX;
-using CurvatureMetric::max;
-using CurvatureMetric::Mesh;
-using CurvatureMetric::OverlayMesh;
-using CurvatureMetric::Scalar;
-using CurvatureMetric::swap;
-using CurvatureMetric::T;
-using CurvatureMetric::VectorX;
-using std::isnan;
-using std::min;
-typedef Eigen::Matrix<Scalar, 2, 1> Vector2;
-typedef Eigen::Matrix<Scalar, 3, 1> Vector3;
-typedef Eigen::Matrix<Scalar, 2, 2> Matrix2x2;
+using Optimization::DifferentiableConeMetric;
 typedef Eigen::Matrix<int, Eigen::Dynamic, 2> RowVectors2i;
 
 
@@ -72,23 +60,6 @@ int compute_euler_characteristic(const Mesh<Scalar>& m);
  */
 int compute_genus(const Mesh<Scalar>& m);
 
-/**
- * @brief Compute a rotation matrix corresponding to a given angle
- * 
- * @param theta: rotation angle
- * @return rotation angle
- */
-Matrix2x2 compute_rotation(Scalar theta);
-
-/**
- * @brief Solve a linear system with matrix valued right hand side
- * 
- * @param A: matrix to invert
- * @param B: right hand side matrix
- * @return solution to AX = B
- */
-MatrixX solve_linear_system(const MatrixX& A, const MatrixX& B);
-
 /**
  * @brief Compute the map from vertex-vertex edges to primal mesh halfedges
  * 
@@ -99,4 +70,5 @@ MatrixX solve_linear_system(const MatrixX& A, const MatrixX& B);
  */
 Eigen::SparseMatrix<int> compute_vv_to_halfedge_matrix(const Mesh<Scalar>& m);
 
-} // namespace PennerHolonomy
+} // namespace Holonomy
+} // namespace Penner

include/holonomy/holonomy/core/common.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include "holonomy/core/common.h"
+
+#include "util/spanning_tree.h"
+
+namespace Penner {
+namespace Holonomy {
+
+/**
+ * @brief Compute dual edge lengths using the DEC formulation with dual vertices at circumcenters.
+ *
+ * @param m: mesh with primal edge lengths
+ * @return per-halfedge dual edge lengths
+ */
+std::vector<Scalar> compute_dual_edge_lengths(const Mesh<Scalar>& m);
+
+/**
+ * @brief Compute the edge weights for a primal tree given by the length of the root cycle
+ * generated by adding an edge to a dual spanning tree (or 0 if the edge is in the spanning tree)
+ *
+ * @param m: underlying mesh
+ * @param weights: weights on the dual mesh for loop lengths
+ * @param dual_tree: spanning dual tree
+ * @return per-halfedge dual loop length weights
+ */
+std::vector<Scalar> compute_dual_loop_length_weights(
+    const Mesh<Scalar>& m,
+    const std::vector<Scalar>& weights,
+    const DualTree& dual_tree);
+
+} // namespace Holonomy
+} // namespace Penner

include/holonomy/holonomy/core/dual_lengths.h

@@ -3,7 +3,8 @@
 #include "holonomy/core/common.h"
 #include "holonomy/core/dual_segment.h"
 
-namespace PennerHolonomy {
+namespace Penner {
+namespace Holonomy {
 
 typedef std::array<int, 2> DualSegment;
 
@@ -346,5 +347,5 @@ class DualLoopManager{
     std::vector<int> m_temp_list;
 };
 
-
-} // namespace PennerHolonomy
+} // namespace Holonomy
+} // namespace Penner

include/holonomy/holonomy/core/dual_loop.h

@@ -2,7 +2,8 @@
 
 #include "holonomy/core/common.h"
 
-namespace PennerHolonomy {
+namespace Penner {
+namespace Holonomy {
 
 typedef std::array<int, 2> DualSegment;
 
@@ -136,4 +137,5 @@ void view_dual_path(
     const Mesh<Scalar>& m,
     const std::vector<DualSegment>& dual_path);
 
-} // namespace PennerHolonomy
+} // namespace Holonomy
+} // namespace Penner

include/holonomy/holonomy/core/dual_segment.h

@@ -3,7 +3,8 @@
 
 #include "holonomy/core/common.h"
 
-namespace PennerHolonomy {
+namespace Penner {
+namespace Holonomy {
 
 /**
  * @brief Generate a cross field for a mesh
@@ -18,4 +19,5 @@ std::tuple<Eigen::MatrixXd, std::vector<Scalar>> generate_cross_field(
     const Eigen::MatrixXi& F);
 
 
-} // namespace PennerHolonomy
+} // namespace Holonomy
+} // namespace Penner

include/holonomy/holonomy/core/field.h

@@ -3,7 +3,8 @@
 #include "holonomy/core/common.h"
 #include "holonomy/core/dual_loop.h"
 
-namespace PennerHolonomy {
+namespace Penner {
+namespace Holonomy {
 
 /**
  * @brief Determine if a one form is valid.
@@ -128,4 +129,5 @@ VectorX scale_edges_by_zero_form(
     const VectorX& metric_coords,
     const VectorX& zero_form);
 
-} // namespace PennerHolonomy
+} // namespace Holonomy
+} // namespace Penner

include/holonomy/holonomy/core/forms.h

@@ -3,9 +3,10 @@
 
 #include "holonomy/core/common.h"
 #include "holonomy/core/dual_loop.h"
-#include "holonomy/core/spanning_tree.h"
+#include "util/spanning_tree.h"
 
-namespace PennerHolonomy {
+namespace Penner {
+namespace Holonomy {
 
 /**
  * @brief Construct a clockwise dual path around a vertex in the mesh.
@@ -133,4 +134,5 @@ class HomotopyBasisGenerator
 typedef HomotopyBasisGenerator HomologyBasisGenerator;
 
 
-} // namespace PennerHolonomy
+} // namespace Holonomy
+} // namespace Penner

include/holonomy/holonomy/core/homology_basis.h

@@ -2,7 +2,8 @@
 
 #include "holonomy/core/common.h"
 
-namespace PennerHolonomy {
+namespace Penner {
+namespace Holonomy {
 
 class IntrinsicNRosyField
 {
@@ -57,6 +58,5 @@ class IntrinsicNRosyField
     VectorX compute_rotation_form(const Mesh<Scalar>& m);
 };
 
-
-
-} // namespace PennerHolonomy
+} // namespace Holonomy
+} // namespace Penner