Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Julia Gilenko HW6 #47

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions src/angle_defect.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
#include "../include/angle_defect.h"
#include "../include/internal_angles.h"
#include <igl/squared_edge_lengths.h>
#include <math.h>

void angle_defect(
const Eigen::MatrixXd & V,
const Eigen::MatrixXi & F,
Eigen::VectorXd & D)
const Eigen::MatrixXd & V,
const Eigen::MatrixXi & F,
Eigen::VectorXd & D)
{
D = Eigen::VectorXd::Zero(V.rows());
Eigen::MatrixXd l_sqr;
igl::squared_edge_lengths(V, F, l_sqr);

Eigen::MatrixXd A;
internal_angles(l_sqr, A);

D = Eigen::VectorXd::Constant(V.rows(), 2 * M_PI);

for (int i = 0; i < F.rows(); i++)
{
for (int j = 0; j < 3; j++)
{
D[F(i,j)] -= A(i, j);
}
}
}
20 changes: 17 additions & 3 deletions src/internal_angles.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
#include "../include/internal_angles.h"
#include <math.h>

void internal_angles(
const Eigen::MatrixXd & l_sqr,
Eigen::MatrixXd & A)
const Eigen::MatrixXd & l_sqr,
Eigen::MatrixXd & A)
{
// Add with your code
A.resize(l_sqr.rows(), l_sqr.cols());
for (int i = 0; i < l_sqr.rows(); i++)
{
Eigen::VectorXd l = l_sqr.row(i);
for (int j = 0; j < l.size(); j++) {

// cosine law
double c_sqrd = l[j];
double b_sqrd = l[(j + 1) % 3];
double a_sqrd = l[(j + 2) % 3];

A(i,j) = acos((c_sqrd - a_sqrd - b_sqrd) / (-2 * sqrt(a_sqrd * b_sqrd)));
}
}
}
18 changes: 13 additions & 5 deletions src/mean_curvature.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
#include "../include/mean_curvature.h"
#include <igl/cotmatrix.h>
#include <igl/invert_diag.h>
#include <igl/massmatrix.h>

void mean_curvature(
const Eigen::MatrixXd & V,
const Eigen::MatrixXi & F,
Eigen::VectorXd & H)
const Eigen::MatrixXd & V,
const Eigen::MatrixXi & F,
Eigen::VectorXd & H)
{
// Replace with your code
H = Eigen::VectorXd::Zero(V.rows());
Eigen::SparseMatrix<double> L, M, Minv;
igl::cotmatrix(V, F, L);
igl::massmatrix(V, F, igl::MASSMATRIX_TYPE_DEFAULT, M);
igl::invert_diag(M, Minv);

Eigen::MatrixXd Hn = Minv * L * V;
H = Hn.rowwise().norm();
}
144 changes: 133 additions & 11 deletions src/principal_curvatures.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,138 @@
#include "../include/principal_curvatures.h"
#include <cmath>
#include <Eigen/Eigenvalues>
#include <igl/adjacency_matrix.h>
#include <igl/per_vertex_normals.h>
#include <igl/pinv.h>
#include <igl/sort.h>

void minmax(const Eigen::VectorXd eigenvalues,
double & min,
double & max,
int & imin,
int & imax)
{
imin = 0;
imax = 0;

max = eigenvalues[0];
min = eigenvalues[0];

for (int i = 1; i < eigenvalues.size(); i++)
{
if (eigenvalues[i] > max)
{
max = eigenvalues[i];
imax = i;
}
else if (eigenvalues[i] < min)
{
min = eigenvalues[i];
imin = i;
}
}
}

void shape_operator(
const Eigen::VectorXd & a,
Eigen::MatrixXd & S)
{
double E = 1 + std::pow(a[0], 2);
double F = a[0] * a[1];
double G = 1 + std::pow(a[1], 2);

double d = E + G - 1;

double e = 2 * a[2] / sqrt(d);
double f = a[3] / sqrt(d);
double g = 2 * a[4] / sqrt(d);

Eigen::MatrixXd h(2, 2), H(2, 2);
h << e, f, f, g;
H << E, F, F, G;

S.resize(2, 2);
S = -h * H.inverse();
}

void principal_curvatures(
const Eigen::MatrixXd & V,
const Eigen::MatrixXi & F,
Eigen::MatrixXd & D1,
Eigen::MatrixXd & D2,
Eigen::VectorXd & K1,
Eigen::VectorXd & K2)
const Eigen::MatrixXd & V,
const Eigen::MatrixXi & F,
Eigen::MatrixXd & D1,
Eigen::MatrixXd & D2,
Eigen::VectorXd & K1,
Eigen::VectorXd & K2)
{
// Replace with your code
K1 = Eigen::VectorXd::Zero(V.rows());
K2 = Eigen::VectorXd::Zero(V.rows());
D1 = Eigen::MatrixXd::Zero(V.rows(),3);
D2 = Eigen::MatrixXd::Zero(V.rows(),3);
K1.resize(V.rows());
K2.resize(V.rows());
D1.resize(V.rows(), 3);
D2.resize(V.rows(), 3);

Eigen::SparseMatrix<double> A;
igl::adjacency_matrix(F, A);

Eigen::MatrixXd N;
igl::per_vertex_normals(V, F, N);

for (int k = 0; k < A.outerSize(); k++)
{
std::vector<int> vs;
for (Eigen::SparseMatrix<double>::InnerIterator it(A, k); it; ++it)
{
vs.push_back(it.row());
}

Eigen::MatrixXd P(vs.size(), 3);
for (int v = 0; v < vs.size(); v++)
{
P.row(v) = V.row(vs[v]) - V.row(k);
}

// compute eigenvalues and eigenvectors
Eigen::SelfAdjointEigenSolver<Eigen::MatrixXd> es;
Eigen::MatrixXd PP = P.transpose() * P;
es.compute(PP);
Eigen::MatrixXd PP_eigs, IPP;

// choose the eigenvectors with highest eigenvalues
double Pmin, Pmax;
int iPmin, iPmax;
minmax(es.eigenvalues(), Pmin, Pmax, iPmin, iPmax);
Eigen::VectorXd Peig1 = es.eigenvectors().col(iPmax);
Eigen::VectorXd Peig2 = es.eigenvectors().col(3 - iPmin - iPmax);

// change of basis
Eigen::MatrixXd principal_dir(3, 2);
principal_dir << Peig1 / Peig1.norm(), Peig2 / Peig2.norm();
Eigen::MatrixXd uv = P * principal_dir;
Eigen::VectorXd w = P * (N.row(k).transpose() / N.row(k).norm());

// least squares approximation
Eigen::MatrixXd C(P.rows(), 5), X, S;
C << uv.col(0),
uv.col(1),
uv.col(0).array().square(),
uv.col(0).array() * uv.col(1).array(),
uv.col(1).array().square();
igl::pinv(C, X);
Eigen::VectorXd a = X * w;

// eigendecomposition of shape operator
shape_operator(a, S);
es.compute(S);
Eigen::VectorXd S_eigvals;
Eigen::MatrixXd S_eigvecs;

double Smin, Smax;
int iSmin, iSmax;
minmax(es.eigenvalues(), Smin, Smax, iSmin, iSmax);

K1[k] = Smax;
K2[k] = Smin;

D1.row(k) = principal_dir * es.eigenvectors().col(iSmax);
D2.row(k) = principal_dir * es.eigenvectors().col(iSmin);
D1.row(k) /= D1.row(k).norm();
D2.row(k) /= D2.row(k).norm();
}
}