| commit | 158a3f478ff021be3c30fcc73b9ba779f4b40fbb | [log] |
|---|---|---|
| author | Julien Nabet <serval2412@yahoo.fr> | Tue Jul 28 11:32:03 2020 +0200 |
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | Thu Jul 30 11:53:44 2020 +0200 |
| tree | 26965fa3d2231654d00b96dd4acb8e645624a927 | |
| parent | 2080c4e2a4852538d3739d70e3c706ec3fc8fb28 [diff] |
Related tdf#135211: return early if no data With DEPS or SCO Evolutionary algorithms, it'll return "No solution found." Change-Id: I15e8e24eb519a20e3f3645b79e990949f648fbd2 Change-Id: I7321419ccc1cd00d75f03fa86d3c0cb4bf9ad473 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99584 Tested-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit a7e92d71d72d69b887bf716f30af37105f206915) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99548 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
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 c0b10c2..c5724ca 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
@@ -189,6 +189,10 @@ public abstract class BaseEvolutionarySolver extends BaseNLPSolver { protected void initializeSolve() { super.initializeSolve(); if (m_variableCount == 0) { return; } if (m_enhancedSolverStatus.getValue()) m_solverStatusDialog = new EvolutionarySolverStatusUno(m_xContext); else
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java index f152cf9..aff425b 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java
@@ -119,6 +119,10 @@ public final class DEPSSolverImpl extends BaseEvolutionarySolver Logger.getLogger(DEPSSolverImpl.class.getName()).log(Level.SEVERE, null, ex); } initializeSolve(); if (m_problemEncoder == null) { return; } //Init: DEPSAgent[] agents = new DEPSAgent[m_swarmSize.getValue()];
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/SCOSolverImpl.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/SCOSolverImpl.java index cefe510..c179860 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/SCOSolverImpl.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/SCOSolverImpl.java
@@ -90,6 +90,11 @@ public final class SCOSolverImpl extends BaseEvolutionarySolver public void solve() { initializeSolve(); if (m_problemEncoder == null) { return; } //Init: int swarmSize = m_swarmSize.getValue(); SCAgent[] agents = new SCAgent[swarmSize];