diff --git a/src/HarmonicBase3D2D/HarmonicPolygon.cpp b/src/HarmonicBase3D2D/HarmonicPolygon.cpp index 7e85fd8..248d66c 100644 --- a/src/HarmonicBase3D2D/HarmonicPolygon.cpp +++ b/src/HarmonicBase3D2D/HarmonicPolygon.cpp @@ -3,7 +3,6 @@ #include #include "GaussQuadrature.h" #include "pmp/SurfaceMesh.h" -#include "pmp/algorithms/Triangulation.h" #include "../Surface/diffgeo.h" Eigen::Vector3d HarmonicPolygon::getScaledNormal() const { diff --git a/src/HarmonicBase3D2D/HarmonicPolygon.hpp b/src/HarmonicBase3D2D/HarmonicPolygon.hpp index 90bec9c..3aed924 100644 --- a/src/HarmonicBase3D2D/HarmonicPolygon.hpp +++ b/src/HarmonicBase3D2D/HarmonicPolygon.hpp @@ -4,8 +4,6 @@ #include #include - - class HarmonicPolygon { int n = 0; diff --git a/src/Surface/GeodesicsInHeat.cpp b/src/Surface/GeodesicsInHeat.cpp index ae9a203..28dbf72 100644 --- a/src/Surface/GeodesicsInHeat.cpp +++ b/src/Surface/GeodesicsInHeat.cpp @@ -266,22 +266,6 @@ void GeodesicsInHeat::distance_to_texture_coordinates() const { auto distances = mesh_.get_vertex_property("v:dist"); assert(distances); -// // scale with boundingbox size for comparable geodesic rings -// Scalar bb_size; -// bb_size = mesh_.bounds().size(); -// auto tex = mesh_.vertex_property("v:tex"); -// for (auto v : mesh_.vertices()) -// { -// if (distances[v] <= FLT_MAX) -// { -// tex[v] = TexCoord(distances[v] / bb_size, 0.0); -// } -// else -// { -// tex[v] = TexCoord(1.0, 0.0); -// } -// } - // find maximum distance Scalar maxdist(0); for (auto v: mesh_.vertices()) { diff --git a/src/Surface/LaplaceConstruction.h b/src/Surface/LaplaceConstruction.h index ff1271f..83cb165 100644 --- a/src/Surface/LaplaceConstruction.h +++ b/src/Surface/LaplaceConstruction.h @@ -8,7 +8,6 @@ #include #include #include - //============================================================================= using namespace pmp; diff --git a/src/Surface/Poisson_System.cpp b/src/Surface/Poisson_System.cpp index 6fd4310..f107cb8 100644 --- a/src/Surface/Poisson_System.cpp +++ b/src/Surface/Poisson_System.cpp @@ -94,11 +94,6 @@ double solve_poisson_system(pmp::SurfaceMesh &mesh, int laplace, int minpoint, } solver.analyzePattern(M); solver.factorize(M); -// Astrid -// analytic_solution.normalize(); -// Fernando -// analytic_solution /= sqrt(analytic_solution.transpose() * M * analytic_solution); - X = solver.solve(S * analytic_solution); if (solver.info() != Eigen::Success) { std::cout << "Issue: " << solver.info() << std::endl; diff --git a/src/Surface/SpectralProcessing.cpp b/src/Surface/SpectralProcessing.cpp index 6594b7c..3bf229b 100644 --- a/src/Surface/SpectralProcessing.cpp +++ b/src/Surface/SpectralProcessing.cpp @@ -107,8 +107,6 @@ double solve_eigenvalue_problem(SurfaceMesh &mesh, int laplace, int face_point, analytic_eigenvalues_unitsphere(analytic, num_eval); for (int i = 1; i < evalues.size(); i++) { -// std::cout << evalues(i) << "," << analytic(i) << "," -// << evalues(i) - analytic(i) << std::endl; ev_file << evalues(i) << "," << analytic(i) << "," << evalues(i) - analytic(i) << std::endl; error += pow(evalues(i) - analytic(i), 2); diff --git a/src/SurfaceViewer.h b/src/SurfaceViewer.h index fa68cc4..5647fec 100644 --- a/src/SurfaceViewer.h +++ b/src/SurfaceViewer.h @@ -1,7 +1,4 @@ //============================================================================= -// Copyright 2021 Astrid Bunge, Mario Botsch, Marc Alexa. -// Distributed under MIT license, see file LICENSE for details. -//============================================================================= #pragma once //============================================================================= diff --git a/src/Volume/Diamond_3D.cpp b/src/Volume/Diamond_3D.cpp index 1d1cca9..5ed21bc 100644 --- a/src/Volume/Diamond_3D.cpp +++ b/src/Volume/Diamond_3D.cpp @@ -1,12 +1,7 @@ //============================================================================= -// Copyright 2021 Astrid Bunge, Mario Botsch, Marc Alexa. -// Distributed under MIT license, see file LICENSE for details. -//============================================================================= - #include "Diamond_3D.h" #include #include "diffgeo_3D.h" - //============================================================================= using SparseMatrix = Eigen::SparseMatrix; diff --git a/src/Volume/Diamond_3D.h b/src/Volume/Diamond_3D.h index 093e7f0..8c35b48 100644 --- a/src/Volume/Diamond_3D.h +++ b/src/Volume/Diamond_3D.h @@ -1,7 +1,4 @@ //============================================================================= -// Copyright 2021 Astrid Bunge, Mario Botsch, Marc Alexa. -// Distributed under MIT license, see file LICENSE for details. -//============================================================================= #pragma once //============================================================================= diff --git a/src/Volume/HarmonicBasis.cpp b/src/Volume/HarmonicBasis.cpp index db05435..57a8691 100644 --- a/src/Volume/HarmonicBasis.cpp +++ b/src/Volume/HarmonicBasis.cpp @@ -144,9 +144,6 @@ void setup_3D_harmonic_stiffness_matrix(PolyhedralMesh &mesh, Eigen::SparseMatri vector> faces; allCellVertices[i] = mesh.getCellGeometry(i, vertices, faces); harmonicPolyhedra[i] = HarmonicPolyhedron(vertices, faces); - -// if(i % 10 == 0) std::cout << i << " / " << nc << std::endl; - }, nc); // cannot parallelize quadrature initialization because tetgen seems to be not thread safe @@ -155,9 +152,7 @@ void setup_3D_harmonic_stiffness_matrix(PolyhedralMesh &mesh, Eigen::SparseMatri threadHelper<6>([&](const int i){ harmonicPolyhedra[i].stiffnessMatrix(allK[i]); -// harmonicPolyhedra[i].massMatrix(allM[i]); -// if(i % 10 == 0) std::cout << i << " / " << nc << std::endl; -// + }, nc); vector> tripK; @@ -277,7 +272,6 @@ double setup_3D_harmonic_stiffness_matrix(PolyhedralMesh &mesh, Eigen::SparseMat time += t.elapsed(); file << t.elapsed() << ","; t.start(); -// std::cout << "Basis construction << t.elapsed() << // cannot parallelize quadrature initialization because tetgen seems to be not thread safe for(int i = 0; i < nc; ++i) harmonicPolyhedra[i].initQuadrature(); t.stop(); @@ -287,7 +281,6 @@ double setup_3D_harmonic_stiffness_matrix(PolyhedralMesh &mesh, Eigen::SparseMat threadHelper<8>([&](const int i){ harmonicPolyhedra[i].stiffnessMatrix(allK[i]); -// if(i % 10 == 0) std::cout << i << " / " << nc << std::endl; }, nc); diff --git a/src/Volume/diffgeo_3D.h b/src/Volume/diffgeo_3D.h index 24a96d0..520653c 100644 --- a/src/Volume/diffgeo_3D.h +++ b/src/Volume/diffgeo_3D.h @@ -1,7 +1,4 @@ //============================================================================= -// Copyright 2021 Astrid Bunge, Mario Botsch, Marc Alexa. -// Distributed under MIT license, see file LICENSE for details. -//============================================================================= #pragma once //============================================================================= #include diff --git a/src/VolumeViewer.cpp b/src/VolumeViewer.cpp index 25d00c8..8c40fd7 100644 --- a/src/VolumeViewer.cpp +++ b/src/VolumeViewer.cpp @@ -1,7 +1,4 @@ //============================================================================= -// Copyright 2021 Astrid Bunge, Mario Botsch, Marc Alexa. -// Distributed under MIT license, see file LICENSE for details. -//============================================================================= #include #include diff --git a/src/VolumeViewer.h b/src/VolumeViewer.h index e07d2e5..3111d7e 100644 --- a/src/VolumeViewer.h +++ b/src/VolumeViewer.h @@ -1,7 +1,4 @@ //============================================================================= -// Copyright 2021 Astrid Bunge, Mario Botsch, Marc Alexa. -// Distributed under MIT license, see file LICENSE for details. -//============================================================================= #pragma once //============================================================================= diff --git a/src/main.cpp b/src/main.cpp index a7c8455..480f73c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,4 @@ //============================================================================= -// Copyright 2021 Astrid Bunge, Mario Botsch, Marc Alexa. -// Distributed under MIT license, see file LICENSE for details. -//============================================================================= #include "SurfaceViewer.h" #include "VolumeViewer.h"