[Libreoffice-commits] core.git: nlpsolver/src nlpsolver/ThirdParty

[Noel Grandin (via logerrit)]

 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java |   33 ++++++----
 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java              |    4 -
 2 files changed, 23 insertions(+), 14 deletions(-)

New commits:
commit 4b99e377473e74160627d3b257fec7b3bc8e7763
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Jul 18 09:11:57 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Jul 18 10:35:16 2021 +0200

    Revert "Some lower objects coupling."
    
    This reverts commit 7b93bae224c7c2c49b105ef97304bb46f8b68da5.
    
    Reason for revert: Does not compile
    /home/tdf/lode/jenkins/workspace/lo_ubsan/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java:45: error: DEPSAgent is not abstract and does not override abstract method setLibrary(Library) in ILibEngine
    public class DEPSAgent implements ILibEngine {
           ^
    1 error
    
    Change-Id: I72f2a22ab1f4119178f8002c21ba0845c4cd1bdf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119040
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
index 7a6077a725c4..b3e5f310031f 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
@@ -38,6 +38,7 @@ import net.adaptivebox.deps.behavior.PSGTBehavior;
 import net.adaptivebox.global.RandomGenerator;
 import net.adaptivebox.goodness.IGoodnessCompareEngine;
 import net.adaptivebox.knowledge.ILibEngine;
+import net.adaptivebox.knowledge.Library;
 import net.adaptivebox.knowledge.SearchPoint;
 import net.adaptivebox.problem.ProblemEncoder;
 import net.adaptivebox.space.BasicPoint;
@@ -71,21 +72,31 @@ public class DEPSAgent implements ILibEngine {
 
   private double switchP = 0.5;
 
-  public DEPSAgent(ProblemEncoder encoder, DEGTBehavior deGTBehavior, PSGTBehavior psGTBehavior, double switchP, IGoodnessCompareEngine comparer) {
-    problemEncoder = encoder;
+  public DEPSAgent(ProblemEncoder encoder, DEGTBehavior deGTBehavior, PSGTBehavior psGTBehavior, double switchP, IGoodnessCompareEngine comparer, Library lib) {
+      setProblemEncoder(encoder);
 
-    trailPoint = problemEncoder.getFreshSearchPoint();
-    pold_t = problemEncoder.getFreshSearchPoint();
-    pcurrent_t = problemEncoder.getFreshSearchPoint();
+      this.switchP = switchP;
 
-    this.switchP = switchP;
+      deGTBehavior.setLibrary(lib);
+      psGTBehavior.setLibrary(lib);
+      setGTBehavior(deGTBehavior);
+      setGTBehavior(psGTBehavior);
+      this.deGTBehavior = deGTBehavior;
+      this.psGTBehavior = psGTBehavior;
 
-    setGTBehavior(deGTBehavior);
-    setGTBehavior(psGTBehavior);
-    this.deGTBehavior = deGTBehavior;
-    this.psGTBehavior = psGTBehavior;
+      qualityComparator = comparer;
+  }
 
-    qualityComparator = comparer;
+  public void setLibrary(Library lib) {
+    deGTBehavior.setLibrary(lib);
+    psGTBehavior.setLibrary(lib);
+  }
+
+  public void setProblemEncoder(ProblemEncoder encoder) {
+    problemEncoder = encoder;
+    trailPoint = problemEncoder.getFreshSearchPoint();
+    pold_t = problemEncoder.getFreshSearchPoint();
+    pcurrent_t = problemEncoder.getFreshSearchPoint();
   }
 
   public void setSpecComparator(IGoodnessCompareEngine comparer) {
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 edba08936d39..20cf9286e91a 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java
@@ -131,16 +131,14 @@ public final class DEPSSolverImpl extends BaseEvolutionarySolver
             deGTBehavior.MIN_FACTOR = Math.min(m_minFactor.getValue(), m_maxFactor.getValue());
             deGTBehavior.MAX_FACTOR = Math.max(m_minFactor.getValue(), m_maxFactor.getValue());
             deGTBehavior.CR = m_CR.getValue();
-            deGTBehavior.setLibrary(m_library);
 
             PSGTBehavior psGTBehavior = new PSGTBehavior();
             psGTBehavior.c1 = m_c1.getValue();
             psGTBehavior.c2 = m_c2.getValue();
             psGTBehavior.CL = m_CL.getValue();
             psGTBehavior.weight = m_weight.getValue();
-            psGTBehavior.setLibrary(m_library);
 
-            agents[i] = new DEPSAgent(m_problemEncoder, deGTBehavior, psGTBehavior, m_agentSwitchRate.getValue(), m_specCompareEngine);
+            agents[i] = new DEPSAgent(m_problemEncoder, deGTBehavior, psGTBehavior, m_agentSwitchRate.getValue(), m_specCompareEngine, m_library);
             agents[i].setPbest(m_library.getSelectedPoint(i));
         }