Skip to content
Snippets Groups Projects
Commit 1adfa885 authored by Lennart Eichhorn's avatar Lennart Eichhorn
Browse files

Fixed generation counter.

parent fb251c9d
No related branches found
No related tags found
No related merge requests found
......@@ -71,14 +71,7 @@ public class GeneticAlgorithm {
// Settings that are dependant on encoding
if (config.getEncodingVariant().equals("NESW")) {
int nullCount = 0;
/*for (int i = 0; i < config.getVisualizers().length; i++) {
if (!config.getVisualizers()[i].equals(VisualizerMethods.Console)
&& !config.getVisualizers()[i].equals(VisualizerMethods.Image)) {
nullCount++;
}
}*/
this.visualizers = new Visualizer[config.getVisualizers().length - nullCount];
this.visualizers = new Visualizer[config.getVisualizers().length];
int j = 0;
for (VisualizerMethods vm : config.getVisualizers()) {
if (vm.equals(VisualizerMethods.Console)) {
......@@ -135,17 +128,17 @@ public class GeneticAlgorithm {
}
public void simulateGenerations() {
for (int gen = 0; gen < config.getTotalGenerations()-1; gen++) {
evaluateGeneration();
for (int gen = 0; gen < config.getTotalGenerations(); gen++) {
//TODO Remove with the new Generation class
generation = gen;
evaluateGeneration();
visualizeGeneration();
filterGeneration();
mutateGeneration();
evaluateGeneration();
}
evaluateGeneration();
visualizeGeneration();
}
......
......@@ -53,7 +53,7 @@ public class BestFoldingsToVideo implements Visualizer {
@Override
public void drawProtein(Candidate[] generation, GeneticAlgorithm geneticAlgorithm) {
//TODO Only render video for the last generation
if(geneticAlgorithm.generation == config.getTotalGenerations()-2){
if(geneticAlgorithm.generation == config.getTotalGenerations()-1){
String filename = config.getLogfileDirectory() + "/" + config.getJobName() + ".mp4";
createVideo(
config.getImageSequenceDirectory(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment