ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Some lower objects coupling.

Browse Source 
Change-Id: I0a7c658d830f82d627d20b9ed7000f3c5b8f1f89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119105
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Todor Balabanov
2021-07-17 22:22:17 +02:00
committed by Noel Grandin
parent 5be9e0760e
commit 7b93bae224
2 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
Vendored
+11 -22
View File
@@ -38,7 +38,6 @@ 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;
@@ -72,31 +71,21 @@ public class DEPSAgent implements ILibEngine {
private double switchP = 0.5;
public DEPSAgent(ProblemEncoder encoder, DEGTBehavior deGTBehavior, PSGTBehavior psGTBehavior, double switchP, IGoodnessCompareEngine comparer, Library lib) {
setProblemEncoder(encoder);
this.switchP = switchP;
deGTBehavior.setLibrary(lib);
psGTBehavior.setLibrary(lib);
setGTBehavior(deGTBehavior);
setGTBehavior(psGTBehavior);
this.deGTBehavior = deGTBehavior;
this.psGTBehavior = psGTBehavior;
qualityComparator = comparer;
}
public void setLibrary(Library lib) {
deGTBehavior.setLibrary(lib);
psGTBehavior.setLibrary(lib);
}
public void setProblemEncoder(ProblemEncoder encoder) {
public DEPSAgent(ProblemEncoder encoder, DEGTBehavior deGTBehavior, PSGTBehavior psGTBehavior, double switchP, IGoodnessCompareEngine comparer) {
problemEncoder = encoder;
trailPoint = problemEncoder.getFreshSearchPoint();
pold_t = problemEncoder.getFreshSearchPoint();
pcurrent_t = problemEncoder.getFreshSearchPoint();
this.switchP = switchP;
setGTBehavior(deGTBehavior);
setGTBehavior(psGTBehavior);
this.deGTBehavior = deGTBehavior;
this.psGTBehavior = psGTBehavior;
qualityComparator = comparer;
}
public void setSpecComparator(IGoodnessCompareEngine comparer) {
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java
+3 -1
View File
@@ -131,14 +131,16 @@ 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, m_library);
agents[i] = new DEPSAgent(m_problemEncoder, deGTBehavior, psGTBehavior, m_agentSwitchRate.getValue(), m_specCompareEngine);
agents[i].setPbest(m_library.getSelectedPoint(i));
}