Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code simplifications (suggested by "sonarcloud").

This commit is contained in:
Gilles Sadowski 2021-07-14 00:36:10 +02:00
parent df895da9be
commit 8f83827846
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/SimplexOptimizer.java
View File

@ -123,27 +123,14 @@ public class SimplexOptimizer extends MultivariateOptimizer {
// Indirect call to "computeObjectiveValue" in order to update the
// evaluations counter.
final MultivariateFunction evalFunc
= new MultivariateFunction() {
/** {@inheritDoc} */
@Override
public double value(double[] point) {
return computeObjectiveValue(point);
}
};
final MultivariateFunction evalFunc = (p) -> computeObjectiveValue(p);
final boolean isMinim = getGoalType() == GoalType.MINIMIZE;
final Comparator<PointValuePair> comparator
= new Comparator<PointValuePair>() {
/** {@inheritDoc} */
@Override
public int compare(final PointValuePair o1,
final PointValuePair o2) {
final double v1 = o1.getValue();
final double v2 = o2.getValue();
return isMinim ? Double.compare(v1, v2) : Double.compare(v2, v1);
}
};
final Comparator<PointValuePair> comparator = (o1, o2) -> {
final double v1 = o1.getValue();
final double v2 = o2.getValue();
return isMinim ? Double.compare(v1, v2) : Double.compare(v2, v1);
};
final UnaryOperator<Simplex> update = updateRule.apply(evalFunc, comparator);
@ -202,12 +189,8 @@ public class SimplexOptimizer extends MultivariateOptimizer {
for (OptimizationData data : optData) {
if (data instanceof Simplex) {
simplex = (Simplex) data;
continue;
}
if (data instanceof Simplex.TransformFactory) {
} else if (data instanceof Simplex.TransformFactory) {
updateRule = (Simplex.TransformFactory) data;
continue;
}
}
}