Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Rugged-MOD
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
youngcle
Rugged-MOD
Commits
3fca67ff
Commit
3fca67ff
authored
7 years ago
by
Jonathan Guinet
Browse files
Options
Downloads
Patches
Plain Diff
[BUG] DSGenerator updated to match Hipparchus 1.1
parent
01fb7123
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java
+20
-22
20 additions, 22 deletions
.../orekit/rugged/adjustment/OptimizationProblemBuilder.java
with
20 additions
and
22 deletions
src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java
+
20
−
22
View file @
3fca67ff
...
...
@@ -17,12 +17,14 @@
package
org.orekit.rugged.adjustment
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
org.hipparchus.analysis.differentiation.DSFactory
;
import
org.hipparchus.analysis.differentiation.DerivativeStructure
;
import
org.hipparchus.optim.ConvergenceChecker
;
import
org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresProblem
;
...
...
@@ -37,7 +39,6 @@ import org.orekit.rugged.linesensor.LineSensor;
import
org.orekit.rugged.refining.measures.Observables
;
import
org.orekit.rugged.utils.DSGenerator
;
import
org.orekit.utils.ParameterDriver
;
import
org.orekit.utils.ParameterDriversList
;
/**
* Builder for optimization problem.
...
...
@@ -58,7 +59,7 @@ abstract class OptimizationProblemBuilder {
protected
final
DSGenerator
generator
;
/** parameterDriversList. */
protected
final
ParameterDriver
sList
drivers
;
protected
final
List
<
ParameterDriver
>
drivers
;
/** number of params to refine. */
protected
final
int
nbParams
;
...
...
@@ -76,11 +77,11 @@ abstract class OptimizationProblemBuilder {
*/
OptimizationProblemBuilder
(
final
List
<
LineSensor
>
sensors
,
final
Observables
measures
)
throws
RuggedException
{
throws
RuggedException
{
try
{
this
.
generator
=
this
.
createGenerator
(
sensors
);
this
.
drivers
=
this
.
generator
.
getSelected
();
this
.
nbParams
=
this
.
drivers
.
getNbParams
();
this
.
nbParams
=
this
.
drivers
.
size
();
if
(
this
.
nbParams
==
0
)
{
throw
new
RuggedException
(
RuggedMessages
.
NO_PARAMETERS_SELECTED
);
}
...
...
@@ -102,9 +103,9 @@ abstract class OptimizationProblemBuilder {
/**
* parameters drivers list getter.
*
* @return selected parameters driver
list
* @return selected
list of
parameters driver
*/
public
final
ParameterDriver
sList
getSelectedParametersDriver
()
{
public
final
List
<
ParameterDriver
>
getSelectedParametersDriver
()
{
return
this
.
drivers
;
}
...
...
@@ -130,14 +131,14 @@ abstract class OptimizationProblemBuilder {
* @return the checker
*/
final
ConvergenceChecker
<
LeastSquaresProblem
.
Evaluation
>
createChecker
(
final
double
parametersConvergenceThreshold
)
{
createChecker
(
final
double
parametersConvergenceThreshold
)
{
final
ConvergenceChecker
<
LeastSquaresProblem
.
Evaluation
>
checker
=
(
iteration
,
previous
,
current
)
->
current
.
getPoint
()
.
getLInfDistance
(
previous
.
getPoint
())
<=
parametersConvergenceThreshold
;
return
checker
;
return
checker
;
}
/**
...
...
@@ -148,8 +149,8 @@ abstract class OptimizationProblemBuilder {
final
double
[]
createStartTab
()
{
int
iStart
=
0
;
// get start point (as a normalized value)
final
double
[]
start
=
new
double
[
this
.
drivers
.
getN
bParams
()
];
for
(
final
ParameterDriver
driver
:
this
.
drivers
.
getDrivers
()
)
{
final
double
[]
start
=
new
double
[
this
.
n
bParams
];
for
(
final
ParameterDriver
driver
:
this
.
drivers
)
{
start
[
iStart
++]
=
driver
.
getNormalizedValue
();
}
return
start
;
...
...
@@ -174,7 +175,7 @@ abstract class OptimizationProblemBuilder {
final
ParameterValidator
validator
=
params
->
{
try
{
int
i
=
0
;
for
(
final
ParameterDriver
driver
:
this
.
drivers
.
getDrivers
()
)
{
for
(
final
ParameterDriver
driver
:
this
.
drivers
)
{
// let the parameter handle min/max clipping
driver
.
setNormalizedValue
(
params
.
getEntry
(
i
));
params
.
setEntry
(
i
++,
driver
.
getNormalizedValue
());
...
...
@@ -205,35 +206,34 @@ abstract class OptimizationProblemBuilder {
}
// set up generator list and map
final
ParameterDriver
sList
selected
=
new
ParameterDrivers
List
();
final
List
<
ParameterDriver
>
selected
=
new
Array
List
<>
();
final
Map
<
String
,
Integer
>
map
=
new
HashMap
<>();
for
(
final
LineSensor
sensor
:
selectedSensors
)
{
sensor
.
getParametersDrivers
().
filter
(
driver
->
driver
.
isSelected
()).
forEach
(
driver
->
{
if
(
map
.
get
(
driver
.
getName
())
==
null
)
{
map
.
put
(
driver
.
getName
(),
map
.
size
());
}
try
{
selected
.
add
(
driver
);
}
catch
(
OrekitException
e
)
{
e
.
printStackTrace
();
}
});
}
final
DSFactory
factory
=
new
DSFactory
(
map
.
size
(),
1
);
return
new
DSGenerator
()
{
/** {@inheritDoc} */
@Override
public
ParameterDriver
sList
getSelected
()
{
public
List
<
ParameterDriver
>
getSelected
()
{
return
selected
;
}
/** {@inheritDoc} */
@Override
public
DerivativeStructure
constant
(
final
double
value
)
{
return
new
DerivativeStructure
(
map
.
size
(),
1
,
value
);
return
factory
.
constant
(
value
);
}
/** {@inheritDoc} */
...
...
@@ -243,9 +243,7 @@ abstract class OptimizationProblemBuilder {
if
(
index
==
null
)
{
return
constant
(
driver
.
getValue
());
}
else
{
return
new
DerivativeStructure
(
map
.
size
(),
1
,
index
.
intValue
(),
driver
.
getValue
());
return
factory
.
variable
(
index
.
intValue
(),
driver
.
getValue
());
}
}
...
...
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