Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenVolumeMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenVolumeMesh
OpenVolumeMesh
Commits
05f62120
Commit
05f62120
authored
Aug 03, 2020
by
Valentin Nigolian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apparently did the trick
parent
16cb03a9
Pipeline
#14861
passed with stage
in 13 minutes and 27 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
src/OpenVolumeMesh/DifferentialOperators/EdgeWeightEvaluators.hh
...nVolumeMesh/DifferentialOperators/EdgeWeightEvaluators.hh
+6
-4
src/Unittests/unittests_laplacians.cc
src/Unittests/unittests_laplacians.cc
+0
-2
No files found.
src/OpenVolumeMesh/DifferentialOperators/EdgeWeightEvaluators.hh
View file @
05f62120
...
...
@@ -74,8 +74,6 @@ public:
double
first_alpha
=
alpha
;
VecT
first_nijk
=
nijk
;
std
::
cout
<<
" first alpha : "
<<
first_alpha
<<
std
::
endl
;
hehf_iter
++
;
int
tet_count
(
0
);
...
...
@@ -99,6 +97,7 @@ public:
weight
+=
tet_weight
(
alpha
,
beta
,
theta
);
#if 0
std::cout<<" ===== TET "<<tet_count<<std::endl;
std::cout<<" xl : "<<xl<<std::endl;
std::cout<<" xk : "<<xk<<std::endl;
...
...
@@ -114,6 +113,7 @@ public:
double tet_w = tet_weight(alpha, beta, theta);
std::cout<<" tet weight : "<<tet_w<<std::endl;
std::cout<<" --> cummulated weight : "<<weight<<std::endl;
#endif
//setting-up next iteration
xk
=
xl
;
...
...
@@ -131,7 +131,7 @@ public:
weight
+=
tet_weight
(
alpha
,
beta
,
theta
);
#if 0
std::cout<<" ===== TET "<<tet_count<<std::endl;
std::cout<<" alpha : "<<alpha<<std::endl;
std::cout<<" beta : "<<beta<<std::endl;
...
...
@@ -142,6 +142,7 @@ public:
double tet_w = tet_weight(alpha, beta, theta);
std::cout<<" tet weight : "<<tet_w<<std::endl;
std::cout<<" --> cummulated weight : "<<weight<<std::endl;
#endif
//multiply by Vol(i,j) (i.e. edge length)
weight
*=
(
mesh
.
vertex
(
xi
)
-
mesh
.
vertex
(
xj
)).
norm
()
/
8.
;
...
...
@@ -171,6 +172,7 @@ private:
//weight computation following the paper's formula
return
cot
(
theta
)
*
(
2.
*
(
cotan_alpha
*
cotan_beta
)
/
cos
(
theta
)
-
cotan_alpha
*
cotan_alpha
-
cotan_beta
*
cotan_beta
);;
}
else
{
#if 0
std::cout<<" can't compute tet weight : "<<std::endl;
std::cout<<" epsilon : "<<std::numeric_limits<Scalar>::epsilon() <<std::endl;
std::cout<<" sin alpha : "<<std::setprecision(20)<<sin(alpha)<<std::endl;
...
...
@@ -186,7 +188,7 @@ private:
(fabs(sin(beta)) > std::numeric_limits<Scalar>::epsilon()) << " "<<
(fabs(sin(theta)) > std::numeric_limits<Scalar>::epsilon()) << " "<<
(fabs(cos(theta)) > std::numeric_limits<Scalar>::epsilon()) << std::endl;
#endif
return
0.
f
;
}
}
...
...
src/Unittests/unittests_laplacians.cc
View file @
05f62120
...
...
@@ -250,7 +250,6 @@ TEST_F(DualLaplacianTest, GetPerHalfedgeWeight){
}
#if 0
TEST_F
(
DualLaplacianTest
,
GetPerVertexLaplacian
){
...
...
@@ -277,5 +276,4 @@ TEST_F(DualLaplacianTest, PrecomputedDualLaplacianGivesSameResults){
auto
on_the_fly
=
on_demand_laplacian
[
vertex
];
}
}
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment