Fixed explicit optimization for refactor

Author: rjc8237

CMakeLists.txt

@@ -77,6 +77,7 @@ if(RENDER_TEXTURE)
     igl::core
     igl::glfw
     igl::png
+    igl::embree
     plot
   )
 endif()

src/optimization/cone_metric.hh

@@ -19,41 +19,46 @@ public:
     int num_flips() { return m_flip_seq.size(); };
     const std::vector<int>& get_flip_sequence() const { return m_flip_seq; }
 
+    // Metric access methods: need to access metric coordinates and corner angles
     virtual VectorX get_metric_coordinates() const;
     virtual VectorX get_reduced_metric_coordinates() const = 0;
     virtual void get_corner_angles(VectorX& he2angle, VectorX& he2cot) const;
 
-    MatrixX change_metric_to_reduced_coordinates(
-        const std::vector<int>& I,
-        const std::vector<int>& J,
-        const std::vector<Scalar>& V,
-        int num_rows) const;
-
-    MatrixX change_metric_to_reduced_coordinates(const MatrixX& halfedge_jacobian) const;
-
-    virtual ~DifferentiableConeMetric() = default;
-
+    // Flip method: need to be able to flip metric
     virtual bool flip_ccw(int _h, bool Ptolemy = true);
 
+    // Metric change methods: need to be able to clone metric and change metric coordinates
     virtual std::unique_ptr<DifferentiableConeMetric> clone_cone_metric() const = 0;
     virtual std::unique_ptr<DifferentiableConeMetric> set_metric_coordinates(
         const VectorX& metric_coords) const = 0;
     virtual std::unique_ptr<DifferentiableConeMetric> scale_conformally(const VectorX& u) const = 0;
 
-    virtual void make_discrete_metric() = 0;
-    virtual std::unique_ptr<DifferentiableConeMetric> project_to_constraint(
-        SolveStats<Scalar>& solve_stats,
-        std::shared_ptr<ProjectionParameters> proj_params = nullptr) const = 0;
-    std::unique_ptr<DifferentiableConeMetric> project_to_constraint(
-        std::shared_ptr<ProjectionParameters> proj_params = nullptr) const;
+    // Constraint methods: need to have a differentiable constraint and method to project to it
     virtual bool constraint(
         VectorX& constraint,
         MatrixX& J_constraint,
         bool need_jacobian = true,
         bool only_free_vertices = true) const;
+    virtual std::unique_ptr<DifferentiableConeMetric> project_to_constraint(
+        SolveStats<Scalar>& solve_stats,
+        std::shared_ptr<ProjectionParameters> proj_params = nullptr) const = 0;
+    std::unique_ptr<DifferentiableConeMetric> project_to_constraint(
+        std::shared_ptr<ProjectionParameters> proj_params = nullptr) const;
 
+    // Discrete metric methods: need differentiable method to flip to a discrete metric
+    virtual void make_discrete_metric() = 0;
     virtual MatrixX get_transition_jacobian() const = 0;
 
+    MatrixX change_metric_to_reduced_coordinates(
+        const std::vector<int>& I,
+        const std::vector<int>& J,
+        const std::vector<Scalar>& V,
+        int num_rows) const;
+
+    MatrixX change_metric_to_reduced_coordinates(const MatrixX& halfedge_jacobian) const;
+
+    virtual ~DifferentiableConeMetric() = default;
+
 protected:
     bool m_is_discrete_metric;
     std::vector<int> m_flip_seq;