added charts
BIN
charts/comp5-2.png
Normal file
After Width: | Height: | Size: 66 KiB |
BIN
charts/comp5-3.png
Normal file
After Width: | Height: | Size: 67 KiB |
BIN
charts/comp5.png
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
charts/descVStaboo.png
Normal file
After Width: | Height: | Size: 48 KiB |
BIN
charts/desc_est_lrptVSmulti.png
Normal file
After Width: | Height: | Size: 47 KiB |
BIN
charts/estVStaboo.png
Normal file
After Width: | Height: | Size: 53 KiB |
BIN
charts/est_lrptVSdesc_est_lrpt.png
Normal file
After Width: | Height: | Size: 48 KiB |
BIN
charts/image.png
Normal file
After Width: | Height: | Size: 258 KiB |
BIN
charts/image2.png
Normal file
After Width: | Height: | Size: 179 KiB |
BIN
charts/lrptVSest_lrpt
Normal file
After Width: | Height: | Size: 38 KiB |
BIN
charts/makespans1.ods
Normal file
BIN
charts/makespans2.ods
Normal file
BIN
charts/makespans3.ods
Normal file
BIN
charts/sptVSest_spt
Normal file
After Width: | Height: | Size: 36 KiB |
BIN
charts/taboo.png
Normal file
After Width: | Height: | Size: 36 KiB |
|
@ -100,11 +100,11 @@ public class TabooSolver implements Solver {
|
||||||
/* Check if we have a cycle */
|
/* Check if we have a cycle */
|
||||||
if (isCycle(historic, result.toSchedule().get())){
|
if (isCycle(historic, result.toSchedule().get())){
|
||||||
System.out.println("CYCLE");
|
System.out.println("CYCLE");
|
||||||
break;
|
break; // remove to allow cycles
|
||||||
}
|
}
|
||||||
|
|
||||||
System.out.println("\u001b[34m" + "Current makespam : " + result.toSchedule().get().makespan() + "\u001b[0m, "
|
System.out.println("\u001b[34m" + "Current makespan : " + result.toSchedule().get().makespan() + "\u001b[0m, "
|
||||||
+ "\u001b[32m" + "Current best makespam : " + best + "\u001b[0m, "
|
+ "\u001b[32m" + "Current best makespan : " + best + "\u001b[0m, "
|
||||||
+ "\u001b[33m" + "Number of neighbours : " + getNumberOfNeighbours(neighbours) + "\u001b[0m, "
|
+ "\u001b[33m" + "Number of neighbours : " + getNumberOfNeighbours(neighbours) + "\u001b[0m, "
|
||||||
+ "\u001b[37m" + "Number of non-forbidden neighbours : " + getNumberOfNonForbiddenNeighbours(neighbours,previousRO, forbiddenNeighbours, iterationCount) + "\u001b[0m");
|
+ "\u001b[37m" + "Number of non-forbidden neighbours : " + getNumberOfNonForbiddenNeighbours(neighbours,previousRO, forbiddenNeighbours, iterationCount) + "\u001b[0m");
|
||||||
// print to csv
|
// print to csv
|
||||||
|
@ -142,7 +142,7 @@ public class TabooSolver implements Solver {
|
||||||
chart.addSeries("a", xData, makespansData);
|
chart.addSeries("a", xData, makespansData);
|
||||||
chart.addSeries("b", xData, bestData);
|
chart.addSeries("b", xData, bestData);
|
||||||
|
|
||||||
new SwingWrapper(chart).displayChart();
|
new SwingWrapper(chart).displayChart(); // comment to remove chart display
|
||||||
|
|
||||||
return bestRO.toSchedule();
|
return bestRO.toSchedule();
|
||||||
}
|
}
|
||||||
|
|