diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2018-06-24 21:35:06 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2018-07-06 10:43:03 +0200 |
commit | aa7908cdadc3933fa40d74c8eaa9478329115594 (patch) | |
tree | edabbd242348a4b00aa1ddc2f9349f3427d0d78f /nlpsolver | |
parent | e81d65e6b0d3fbad66f11e073f6ebc9a31949ca4 (diff) |
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 <serval2412@yahoo.fr>
(cherry picked from commit 02a66f29fec36aed5fb1e800a08c1390d3674b59)
Reviewed-on: https://gerrit.libreoffice.org/56435
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 12e092b414208ba4342f20fe190681d73d9c6ff9)
Diffstat (limited to 'nlpsolver')
-rw-r--r-- | nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java | 6 |
1 files changed, 6 insertions, 0 deletions
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; } } |