Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openstructure
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
schwede
openstructure
Commits
9cece142
Commit
9cece142
authored
9 years ago
by
Bienchen
Browse files
Options
Downloads
Patches
Plain Diff
Fixing Eigen3/ making it work on in house system
parent
19188333
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
modules/geom/src/vec3.cc
+1
-1
1 addition, 1 deletion
modules/geom/src/vec3.cc
modules/mol/alg/src/superpose_frames.cc
+1
-1
1 addition, 1 deletion
modules/mol/alg/src/superpose_frames.cc
modules/mol/alg/src/svd_superpose.cc
+1
-1
1 addition, 1 deletion
modules/mol/alg/src/svd_superpose.cc
with
3 additions
and
3 deletions
modules/geom/src/vec3.cc
+
1
−
1
View file @
9cece142
...
...
@@ -60,7 +60,7 @@ Mat3 Vec3List::GetPrincipalAxes() const
Mat3
inertia
=
this
->
GetInertia
();
EMat3
inertia_mat
(
inertia
.
Data
());
Eigen
::
JacobiSVD
<
EMat3
>
svd
(
inertia_mat
,
Eigen
::
Compute
Thin
U
);
Eigen
::
JacobiSVD
<
EMat3
>
svd
(
inertia_mat
,
Eigen
::
Compute
Full
U
);
EMat3
rot
=
svd
.
matrixU
();
Mat3
axes
(
rot
.
data
());
return
axes
;
...
...
This diff is collapsed.
Click to expand it.
modules/mol/alg/src/superpose_frames.cc
+
1
−
1
View file @
9cece142
...
...
@@ -97,7 +97,7 @@ void AddSuperposedFrame(CoordGroupHandle& superposed, EMatX3& ref_mat,EMatX3& re
frame_center
=
frame_mat
.
rowwise
().
sum
()
/
frame_mat
.
cols
();
frame_centered
=
row_sub
(
frame_mat
,
frame_center
);
//single value decomposition
Eigen
::
JacobiSVD
<
EMat3
>
svd
(
frame_centered
*
ref_centered
,
Eigen
::
Compute
Thin
U
|
Eigen
::
Compute
Thin
V
);
Eigen
::
JacobiSVD
<
EMat3
>
svd
(
frame_centered
*
ref_centered
,
Eigen
::
Compute
Full
U
|
Eigen
::
Compute
Full
V
);
EMat3
matrixVT
=
svd
.
matrixV
().
transpose
();
//determine rotation
Real
detv
=
matrixVT
.
determinant
();
...
...
This diff is collapsed.
Click to expand it.
modules/mol/alg/src/svd_superpose.cc
+
1
−
1
View file @
9cece142
...
...
@@ -376,7 +376,7 @@ SuperpositionResult MeanSquareMinimizerImpl::Minimize(const EMatX& atoms, const
EMatX
atoms_ref_shifted
=
MatrixShiftedBy
(
atoms_ref
,
avg_ref
).
transpose
();
// determine rotational component
Eigen
::
JacobiSVD
<
EMat3
>
svd
(
atoms_ref_shifted
*
atoms_shifted
,
Eigen
::
Compute
Thin
U
|
Eigen
::
Compute
Thin
V
);
Eigen
::
JacobiSVD
<
EMat3
>
svd
(
atoms_ref_shifted
*
atoms_shifted
,
Eigen
::
Compute
Full
U
|
Eigen
::
Compute
Full
V
);
EMatX
matrixVT
=
svd
.
matrixV
().
transpose
();
//determine rotation
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment