diff --git a/src/main/java/MainClasses/Config.java b/src/main/java/MainClasses/Config.java index 40ae168202a1040c2c22d71895ed0199ffb5fc2d..356e1e6611ff04946dcf797513c5c98cd587045f 100644 --- a/src/main/java/MainClasses/Config.java +++ b/src/main/java/MainClasses/Config.java @@ -150,9 +150,8 @@ public class Config { crossoverMultiplier = Double.parseDouble(this.properties.getProperty("crossoverMultiplier")); // Output settings - if(properties.containsKey("jobName")){ - jobName = this.properties.getProperty("jobName"); - }else{ + jobName = this.properties.getProperty("jobName"); + if(jobName.equals("")) { SimpleDateFormat formatter = new SimpleDateFormat("ddMMyyyyHHmmss"); Date date = new Date(); jobName = formatter.format(date); @@ -275,7 +274,7 @@ public class Config { } public String getImageSequenceDirectory() { - return imageSequenceDirectory; + return imageSequenceDirectory + "/" + jobName; } public String getVideoDirectory() { diff --git a/src/main/resources/genetic.properties b/src/main/resources/genetic.properties index 6a23d74e99be8ad62eb46385ef8ac8f0e03fe945..117b374a31e4e916864b04ffa10a3ff9ba3a170b 100644 --- a/src/main/resources/genetic.properties +++ b/src/main/resources/genetic.properties @@ -9,7 +9,7 @@ # Size of the population in one generation populationSize = 100 # Number of generations to run the algorithm for - noGenerations = 600 + noGenerations = 20 # Type of population initialization [curl | straight | random] initializationMethod = random # Type of selection that should be used [proportional | tournament | onlybest]