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

Code cleanup for PBILPopulation

Browse Source
This commit is contained in:
Fabian Becker 2013-10-11 18:12:50 +02:00
parent ac220652c1
commit cc736955d8
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/eva2/optimization/population/PBILPopulation.java
View File

@ -20,7 +20,7 @@ import java.util.BitSet;
public class PBILPopulation extends Population implements Cloneable, java.io.Serializable { public class PBILPopulation extends Population implements Cloneable, java.io.Serializable {
private double[] m_ProbabilityVector = new double[1]; private double[] probabilityVector = new double[1];
public PBILPopulation() { public PBILPopulation() {
} }
@ -32,15 +32,15 @@ public class PBILPopulation extends Population implements Cloneable, java.io.Ser
public PBILPopulation(PBILPopulation population) { public PBILPopulation(PBILPopulation population) {
super(population); super(population);
this.m_ProbabilityVector = new double[population.m_ProbabilityVector.length]; this.probabilityVector = new double[population.probabilityVector.length];
for (int i = 0; i < this.m_ProbabilityVector.length; i++) { for (int i = 0; i < this.probabilityVector.length; i++) {
this.m_ProbabilityVector[i] = population.m_ProbabilityVector[i]; this.probabilityVector[i] = population.probabilityVector[i];
} }
} }
@Override @Override
public Object clone() { public Object clone() {
return (Object) new PBILPopulation(this); return new PBILPopulation(this);
} }
/** /**
@ -55,9 +55,9 @@ public class PBILPopulation extends Population implements Cloneable, java.io.Ser
System.err.println("Members of the population are not instance of InterfaceGAIndividual!"); System.err.println("Members of the population are not instance of InterfaceGAIndividual!");
return; return;
} }
this.m_ProbabilityVector = new double[((InterfaceGAIndividual) this.get(0)).getGenotypeLength()]; this.probabilityVector = new double[((InterfaceGAIndividual) this.get(0)).getGenotypeLength()];
for (int i = 0; i < this.m_ProbabilityVector.length; i++) { for (int i = 0; i < this.probabilityVector.length; i++) {
this.m_ProbabilityVector[i] = 0.5; this.probabilityVector[i] = 0.5;
} }
} }
@ -74,10 +74,10 @@ public class PBILPopulation extends Population implements Cloneable, java.io.Ser
for (int i = 0; i < examples.size(); i++) { for (int i = 0; i < examples.size(); i++) {
tmpIndy = (InterfaceGAIndividual) (examples.getEAIndividual(i)).clone(); tmpIndy = (InterfaceGAIndividual) (examples.getEAIndividual(i)).clone();
tmpBitSet = tmpIndy.getBGenotype(); tmpBitSet = tmpIndy.getBGenotype();
for (int j = 0; j < this.m_ProbabilityVector.length; j++) { for (int j = 0; j < this.probabilityVector.length; j++) {
this.m_ProbabilityVector[j] *= (1.0 - learnRate); this.probabilityVector[j] *= (1.0 - learnRate);
if (tmpBitSet.get(j)) { if (tmpBitSet.get(j)) {
this.m_ProbabilityVector[j] += learnRate; this.probabilityVector[j] += learnRate;
} }
} }
} }
@ -94,8 +94,8 @@ public class PBILPopulation extends Population implements Cloneable, java.io.Ser
for (int i = 0; i < this.getTargetSize(); i++) { for (int i = 0; i < this.getTargetSize(); i++) {
tmpIndy = (InterfaceGAIndividual) ((AbstractEAIndividual) template).clone(); tmpIndy = (InterfaceGAIndividual) ((AbstractEAIndividual) template).clone();
tmpBitSet = tmpIndy.getBGenotype(); tmpBitSet = tmpIndy.getBGenotype();
for (int j = 0; j < this.m_ProbabilityVector.length; j++) { for (int j = 0; j < this.probabilityVector.length; j++) {
if (RNG.flipCoin(this.m_ProbabilityVector[j])) { if (RNG.flipCoin(this.probabilityVector[j])) {
tmpBitSet.set(j); tmpBitSet.set(j);
} else { } else {
tmpBitSet.clear(j); tmpBitSet.clear(j);
@ -112,15 +112,15 @@ public class PBILPopulation extends Population implements Cloneable, java.io.Ser
* @param mutationRate The mutation rate. * @param mutationRate The mutation rate.
*/ */
public void mutateProbabilityVector(double mutationRate, double sigma) { public void mutateProbabilityVector(double mutationRate, double sigma) {
for (int j = 0; j < this.m_ProbabilityVector.length; j++) { for (int j = 0; j < this.probabilityVector.length; j++) {
if (RNG.flipCoin(mutationRate)) { if (RNG.flipCoin(mutationRate)) {
this.m_ProbabilityVector[j] += RNG.gaussianDouble(sigma); this.probabilityVector[j] += RNG.gaussianDouble(sigma);
} }
if (this.m_ProbabilityVector[j] > 1) { if (this.probabilityVector[j] > 1) {
this.m_ProbabilityVector[j] = 1; this.probabilityVector[j] = 1;
} }
if (this.m_ProbabilityVector[j] < 0) { if (this.probabilityVector[j] < 0) {
this.m_ProbabilityVector[j] = 0; this.probabilityVector[j] = 0;
} }
} }
} }
@ -132,22 +132,22 @@ public class PBILPopulation extends Population implements Cloneable, java.io.Ser
int dim = ((InterfaceGAIndividual) this.get(0)).getGenotypeLength(); int dim = ((InterfaceGAIndividual) this.get(0)).getGenotypeLength();
BitSet tmpSet; BitSet tmpSet;
this.m_ProbabilityVector = new double[dim]; this.probabilityVector = new double[dim];
for (int i = 0; i < this.m_ProbabilityVector.length; i++) { for (int i = 0; i < this.probabilityVector.length; i++) {
this.m_ProbabilityVector[i] = 0; this.probabilityVector[i] = 0;
} }
// first count the true bits // first count the true bits
for (int i = 0; i < this.size(); i++) { for (int i = 0; i < this.size(); i++) {
tmpSet = ((InterfaceGAIndividual) this.get(i)).getBGenotype(); tmpSet = ((InterfaceGAIndividual) this.get(i)).getBGenotype();
for (int j = 0; j < dim; j++) { for (int j = 0; j < dim; j++) {
if (tmpSet.get(j)) { if (tmpSet.get(j)) {
this.m_ProbabilityVector[j] += 1; this.probabilityVector[j] += 1;
} }
} }
} }
// now normalize // now normalize
for (int i = 0; i < dim; i++) { for (int i = 0; i < dim; i++) {
this.m_ProbabilityVector[i] /= this.size(); this.probabilityVector[i] /= this.size();
} }
} }
@ -157,11 +157,11 @@ public class PBILPopulation extends Population implements Cloneable, java.io.Ser
* @param pv The new probability vector. * @param pv The new probability vector.
*/ */
public void setProbabilityVector(double[] pv) { public void setProbabilityVector(double[] pv) {
this.m_ProbabilityVector = pv; this.probabilityVector = pv;
} }
public double[] getProbabilityVector() { public double[] getProbabilityVector() {
return this.m_ProbabilityVector; return this.probabilityVector;
} }
/** /**
@ -175,8 +175,8 @@ public class PBILPopulation extends Population implements Cloneable, java.io.Ser
String result = ""; String result = "";
result += "PBIL-Population:\n"; result += "PBIL-Population:\n";
result += "Probability vector: {"; result += "Probability vector: {";
for (int i = 0; i < this.m_ProbabilityVector.length; i++) { for (int i = 0; i < this.probabilityVector.length; i++) {
result += this.m_ProbabilityVector[i] + "; "; result += this.probabilityVector[i] + "; ";
} }
result += "}\n"; result += "}\n";
result += "Population size: " + this.size() + "\n"; result += "Population size: " + this.size() + "\n";