halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Michael de Paly 2009-11-19 03:11:47 +00:00
parent 45fb50d766
commit c84b1486b1
2 changed files with 67 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java
View File

@ -3,6 +3,9 @@ package eva2.server.go.problems;
import java.awt.Color; import java.awt.Color;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Vector; import java.util.Vector;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Semaphore;
import javax.swing.JFrame; import javax.swing.JFrame;
@ -31,17 +34,20 @@ import eva2.tools.chart2d.DPoint;
*/ */
public abstract class AbstractMultiObjectiveOptimizationProblem extends AbstractOptimizationProblem { public abstract class AbstractMultiObjectiveOptimizationProblem extends AbstractOptimizationProblem {
class MultiObjectiveEvalThread extends Thread{ class MultiObjectiveEvalThread extends Thread{
AbstractMultiObjectiveOptimizationProblem prob; AbstractMultiObjectiveOptimizationProblem prob;
AbstractEAIndividual ind; AbstractEAIndividual ind;
Vector<AbstractEAIndividual> resultrep; Vector<AbstractEAIndividual> resultrep;
Population pop; Population pop;
Semaphore m_Semaphore=null;
public MultiObjectiveEvalThread(AbstractMultiObjectiveOptimizationProblem prob,AbstractEAIndividual ind,Vector<AbstractEAIndividual> resultrep, Population pop) { public MultiObjectiveEvalThread(AbstractMultiObjectiveOptimizationProblem prob,AbstractEAIndividual ind,Vector<AbstractEAIndividual> resultrep, Population pop,Semaphore sema) {
this.ind = ind; this.ind = ind;
this.prob = prob; this.prob = prob;
this.resultrep = resultrep; this.resultrep = resultrep;
this.pop = pop; this.pop = pop;
this.m_Semaphore=sema;
} }
public void run() { public void run() {
@ -49,6 +55,7 @@ public abstract class AbstractMultiObjectiveOptimizationProblem extends Abstract
prob.evaluate(ind); prob.evaluate(ind);
resultrep.add(ind); resultrep.add(ind);
fitness = ind.getFitness(); fitness = ind.getFitness();
// check and update border if necessary // check and update border if necessary
if (m_Border == null) if (m_Border == null)
@ -68,6 +75,7 @@ public abstract class AbstractMultiObjectiveOptimizationProblem extends Abstract
prob.m_Border[j][1] = Math.max(prob.m_Border[j][1], fitness[j]); prob.m_Border[j][1] = Math.max(prob.m_Border[j][1], fitness[j]);
} }
pop.incrFunctionCalls(); pop.incrFunctionCalls();
m_Semaphore.release();
} }
} }
@ -189,20 +197,42 @@ public abstract class AbstractMultiObjectiveOptimizationProblem extends Abstract
Vector<AbstractEAIndividual> queue = new Vector<AbstractEAIndividual>(); Vector<AbstractEAIndividual> queue = new Vector<AbstractEAIndividual>();
Vector<AbstractEAIndividual> finished = new Vector<AbstractEAIndividual>(); Vector<AbstractEAIndividual> finished = new Vector<AbstractEAIndividual>();
queue.addAll(population); queue.addAll(population);
/* Semaphore available=new Semaphore(parallelthreads);
while (finished.size() < population.size()) { while (finished.size() < population.size()) {
try {
available.acquire();
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
if ((population.size()-(queue.size() + finished.size())) < parallelthreads) { if ((population.size()-(queue.size() + finished.size())) < parallelthreads) {
if (queue.size() > 0) { if (queue.size() > 0) {
AbstractEAIndividual tmpindy = queue.get(0); AbstractEAIndividual tmpindy = queue.get(0);
queue.remove(0); queue.remove(0);
tmpindy.resetConstraintViolation(); tmpindy.resetConstraintViolation();
MultiObjectiveEvalThread evalthread = new MultiObjectiveEvalThread(this,tmpindy,finished,population); MultiObjectiveEvalThread evalthread = new MultiObjectiveEvalThread(this,tmpindy,finished,population,available);
evalthread.start(); evalthread.start();
} }
} }
} }
*/
Semaphore sema=new Semaphore(0);
ExecutorService pool = Executors.newFixedThreadPool(parallelthreads);
for (int i = 0; i < population.size(); i++){
AbstractEAIndividual tmpindy = (AbstractEAIndividual)population.get(i);
tmpindy.resetConstraintViolation();
EvalThread evalthread = new EvalThread(this,tmpindy,finished,population,sema);
pool.execute(evalthread);
}
try {
sema.acquire(population.size());
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
pool.shutdownNow();
}else { }else {
// first evaluate the population // first evaluate the population
for (int i = 0; i < population.size(); i++) { for (int i = 0; i < population.size(); i++) {

37
src/eva2/server/go/problems/AbstractOptimizationProblem.java
View File

@ -2,6 +2,9 @@ package eva2.server.go.problems;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.util.Vector; import java.util.Vector;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Semaphore;
import java.io.Serializable; import java.io.Serializable;
@ -41,12 +44,14 @@ public abstract class AbstractOptimizationProblem implements InterfaceOptimizati
AbstractEAIndividual ind; AbstractEAIndividual ind;
Vector<AbstractEAIndividual> resultrep; Vector<AbstractEAIndividual> resultrep;
Population pop; Population pop;
Semaphore m_Semaphore;
public EvalThread(AbstractOptimizationProblem prob, AbstractEAIndividual ind, Vector<AbstractEAIndividual> resultrep, Population pop) { public EvalThread(AbstractOptimizationProblem prob, AbstractEAIndividual ind, Vector<AbstractEAIndividual> resultrep, Population pop,Semaphore sema) {
this.ind = ind; this.ind = ind;
this.prob = prob; this.prob = prob;
this.resultrep = resultrep; this.resultrep = resultrep;
this.pop = pop; this.pop = pop;
this.m_Semaphore=sema;
} }
public void run() { public void run() {
@ -55,6 +60,7 @@ public abstract class AbstractOptimizationProblem implements InterfaceOptimizati
prob.evaluate(ind); prob.evaluate(ind);
resultrep.add(ind); resultrep.add(ind);
pop.incrFunctionCalls(); pop.incrFunctionCalls();
m_Semaphore.release();
// long duration=System.nanoTime()-time; // long duration=System.nanoTime()-time;
// System.out.println("Finished ET" + this + ", time was " + duration); // System.out.println("Finished ET" + this + ", time was " + duration);
} }
@ -105,21 +111,42 @@ public abstract class AbstractOptimizationProblem implements InterfaceOptimizati
if (this.parallelthreads > 1) { if (this.parallelthreads > 1) {
Vector<AbstractEAIndividual> queue = new Vector<AbstractEAIndividual>(population.size()); Vector<AbstractEAIndividual> queue = new Vector<AbstractEAIndividual>(population.size());
Vector<AbstractEAIndividual> finished = new Vector<AbstractEAIndividual>(population.size()); Vector<AbstractEAIndividual> finished = new Vector<AbstractEAIndividual>(population.size());
queue.addAll(population); /* queue.addAll(population);
Semaphore sema=new Semaphore(parallelthreads);
while (finished.size() < population.size()) { while (finished.size() < population.size()) {
try {
sema.acquire();
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
if ((population.size()-(queue.size() + finished.size())) < parallelthreads) { if ((population.size()-(queue.size() + finished.size())) < parallelthreads) {
if (queue.size() > 0) { if (queue.size() > 0) {
AbstractEAIndividual tmpindy = queue.get(0); AbstractEAIndividual tmpindy = queue.get(0);
queue.remove(0); queue.remove(0);
tmpindy.resetConstraintViolation(); tmpindy.resetConstraintViolation();
EvalThread evalthread = new EvalThread(this,tmpindy,finished,population); EvalThread evalthread = new EvalThread(this,tmpindy,finished,population,sema);
evalthread.start(); evalthread.start();
} }
} }
} }*/
Semaphore sema=new Semaphore(0);
ExecutorService pool = Executors.newFixedThreadPool(parallelthreads);
for (int i = 0; i < population.size(); i++){
AbstractEAIndividual tmpindy = (AbstractEAIndividual)population.get(i);
tmpindy.resetConstraintViolation();
EvalThread evalthread = new EvalThread(this,tmpindy,finished,population,sema);
pool.execute(evalthread);
}
try {
sema.acquire(population.size());
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
pool.shutdownNow();
} else { } else {
for (int i = 0; i < population.size(); i++) { for (int i = 0; i < population.size(); i++) {