Skip to content

Commit 8d6409c

Browse files
committed
Made corner angle computation independent of differentiable structure
1 parent a01e0ca commit 8d6409c

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

src/optimization/cone_metric.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ void PennerConeMetric::make_discrete_metric()
190190
SolveStats<Scalar> solve_stats;
191191
bool use_ptolemy = true;
192192
ConformalIdealDelaunay<Scalar>::MakeDelaunay(*this, u, del_stats, solve_stats, use_ptolemy);
193-
m_flip_seq = del_stats.flip_seq; // TODO Append
194193
m_is_discrete_metric = true;
195194
return;
196195
}

src/optimization/constraint.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace CurvatureMetric {
77

8-
bool satisfies_triangle_inequality(const DifferentiableConeMetric& cone_metric)
8+
bool satisfies_triangle_inequality(const Mesh<Scalar>& cone_metric)
99
{
1010
int num_halfedges = cone_metric.n_halfedges();
1111

@@ -28,7 +28,7 @@ bool satisfies_triangle_inequality(const DifferentiableConeMetric& cone_metric)
2828
return true;
2929
}
3030

31-
void corner_angles(const DifferentiableConeMetric& cone_metric, VectorX& he2angle, VectorX& he2cot)
31+
void corner_angles(const Mesh<Scalar>& cone_metric, VectorX& he2angle, VectorX& he2cot)
3232
{
3333
int num_halfedges = cone_metric.n_halfedges();
3434
he2angle.setZero(num_halfedges);

src/optimization/constraint.hh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ namespace CurvatureMetric {
88
/// Check the triangle inequality for every triangle in the mesh with respect to the
99
/// halfedge metric coordinates
1010
///
11-
/// @param[in] cone_metric: mesh with differentiable metric
11+
/// @param[in] cone_metric: mesh with metric
1212
/// @return: true iff each triangle in the mesh satisfies the triangle inequality
13-
bool satisfies_triangle_inequality(const DifferentiableConeMetric& cone_metric);
13+
bool satisfies_triangle_inequality(const Mesh<Scalar>& cone_metric);
1414

1515
/// Compute the triangle angles and cotangent angles of a Delaunay (possibly
1616
/// symmetric) mesh m with metric. Angles are indexed by their opposing halfedge.
1717
///
18-
/// @param[in] cone_metric: mesh with differentiable metric
18+
/// @param[in] cone_metric: mesh with metric
1919
/// @param[out] he2angle: map from halfedges to opposing angle
2020
/// @param[out] he2cot: map from halfedges to cotan of opposing angle
21-
void corner_angles(const DifferentiableConeMetric& cone_metric, VectorX& he2angle, VectorX& he2cot);
21+
void corner_angles(const Mesh<Scalar>& cone_metric, VectorX& he2angle, VectorX& he2cot);
2222

2323
/// Compute the vertex angles of a Delaunay (possibly symmetric) mesh with metric
2424
/// and the Jacobian with respect to the reduced coordinates if needed.

0 commit comments

Comments
 (0)