nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java |
6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 12e092b414208ba4342f20fe190681d73d9c6ff9
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun Jun 24 21:35:06 2018 +0200
tdf#43388: add missing info for Evolutionary Algorithm Solver
Add SolverConstraintOperator.INTEGER_value case and in the same time
the also missing SolverConstraintOperator.BINARY_value case
Change-Id: I18b826e74a2381dedaea3090919118b8d5dad072
Reviewed-on: https://gerrit.libreoffice.org/56359
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
(cherry picked from commit 02a66f29fec36aed5fb1e800a08c1390d3674b59)
Reviewed-on: https://gerrit.libreoffice.org/56435
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git
a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
index 701e6ba63226..c0b10c2f4951 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
@@ -105,6 +105,12 @@ public abstract class BaseEvolutionarySolver extends
BaseNLPSolver {
case SolverConstraintOperator.LESS_EQUAL_value:
setDefaultYAt(i + 1, BasicBound.MINDOUBLE,
constraint.Data);
break;
+ case SolverConstraintOperator.INTEGER_value:
+ setDefaultYAt(i + 1, BasicBound.MINDOUBLE,
BasicBound.MAXDOUBLE);
+ break;
+ case SolverConstraintOperator.BINARY_value:
+ setDefaultYAt(i + 1, 0, 1);
+ break;
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
