Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Thomas White
pinkindexer
Commits
7ecc96dd
Commit
7ecc96dd
authored
Dec 07, 2018
by
Yaroslav Gevorkov
Browse files
allow choosing less fitted nodes if they are fitted significantly better in multi seed refinement
parent
00d340dd
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/PinkIndexer.cpp
View file @
7ecc96dd
...
...
@@ -104,12 +104,12 @@ void PinkIndexer::refine(Lattice& indexedLattice, Vector2f& centerShift, const M
break
;
case
RefinementType
::
firstFixedThenVariableLatticeParametersMultiSeed
:
{
constexpr
int
refinementTries
=
1
5
00
;
constexpr
int
refinementTries
=
1
0
00
;
int
fittedNodesCount
[
refinementTries
];
double
fittedNodesMeanDefects
[
refinementTries
];
Lattice
fittedLattices
[
refinementTries
];
float
maxRelativeDeviation
=
0.01
4
;
float
maxRelativeDeviation
=
0.01
25
;
Array
<
float
,
1
,
3
>
columnDeviationNorms
=
indexedLattice
.
getBasis
().
colwise
().
norm
()
*
maxRelativeDeviation
;
#pragma omp parallel for
for
(
int
i
=
0
;
i
<
refinementTries
;
++
i
)
...
...
@@ -195,8 +195,11 @@ void PinkIndexer::refine(Lattice& indexedLattice, Vector2f& centerShift, const M
double
minFittedNodesMeanDefect
=
refinement
.
getMeanDefect
(
indexedLattice
.
getBasis
(),
ucsDirections
,
ucsBorderNorms
);
for
(
int
i
=
0
;
i
<
refinementTries
;
++
i
)
{
if
(
fittedNodesCount
[
i
]
>
maxFittedNodesCount
||
(
fittedNodesCount
[
i
]
==
maxFittedNodesCount
&&
fittedNodesMeanDefects
[
i
]
<
minFittedNodesMeanDefect
))
// if (fittedNodesCount[i] > maxFittedNodesCount ||
// (fittedNodesCount[i] == maxFittedNodesCount && fittedNodesMeanDefects[i] < minFittedNodesMeanDefect))
if
(
fittedNodesCount
[
i
]
/
maxFittedNodesCount
>
1.2
||
(
fittedNodesCount
[
i
]
>
maxFittedNodesCount
||
fittedNodesMeanDefects
[
i
]
<
minFittedNodesMeanDefect
)
&&
(
fittedNodesCount
[
i
]
/
maxFittedNodesCount
-
1
)
*
3
>
(
minFittedNodesMeanDefect
/
fittedNodesMeanDefects
[
i
]
-
1
))
{
maxFittedNodesCount
=
fittedNodesCount
[
i
];
minFittedNodesMeanDefect
=
fittedNodesMeanDefects
[
i
];
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment