diff --git a/charts/comp5-2.png b/charts/comp5-2.png new file mode 100644 index 0000000..0a3d30e Binary files /dev/null and b/charts/comp5-2.png differ diff --git a/charts/comp5-3.png b/charts/comp5-3.png new file mode 100644 index 0000000..6539fc0 Binary files /dev/null and b/charts/comp5-3.png differ diff --git a/charts/comp5.png b/charts/comp5.png new file mode 100644 index 0000000..3ea12d5 Binary files /dev/null and b/charts/comp5.png differ diff --git a/charts/descVStaboo.png b/charts/descVStaboo.png new file mode 100644 index 0000000..7b26eb8 Binary files /dev/null and b/charts/descVStaboo.png differ diff --git a/charts/desc_est_lrptVSmulti.png b/charts/desc_est_lrptVSmulti.png new file mode 100644 index 0000000..551110d Binary files /dev/null and b/charts/desc_est_lrptVSmulti.png differ diff --git a/charts/estVStaboo.png b/charts/estVStaboo.png new file mode 100644 index 0000000..f66c97b Binary files /dev/null and b/charts/estVStaboo.png differ diff --git a/charts/est_lrptVSdesc_est_lrpt.png b/charts/est_lrptVSdesc_est_lrpt.png new file mode 100644 index 0000000..1386670 Binary files /dev/null and b/charts/est_lrptVSdesc_est_lrpt.png differ diff --git a/charts/image.png b/charts/image.png new file mode 100644 index 0000000..19cce54 Binary files /dev/null and b/charts/image.png differ diff --git a/charts/image2.png b/charts/image2.png new file mode 100644 index 0000000..a15c21f Binary files /dev/null and b/charts/image2.png differ diff --git a/charts/lrptVSest_lrpt b/charts/lrptVSest_lrpt new file mode 100644 index 0000000..eb82792 Binary files /dev/null and b/charts/lrptVSest_lrpt differ diff --git a/charts/makespans1.ods b/charts/makespans1.ods new file mode 100644 index 0000000..daa3760 Binary files /dev/null and b/charts/makespans1.ods differ diff --git a/charts/makespans2.ods b/charts/makespans2.ods new file mode 100644 index 0000000..2d212fe Binary files /dev/null and b/charts/makespans2.ods differ diff --git a/charts/makespans3.ods b/charts/makespans3.ods new file mode 100644 index 0000000..70a1275 Binary files /dev/null and b/charts/makespans3.ods differ diff --git a/charts/sptVSest_spt b/charts/sptVSest_spt new file mode 100644 index 0000000..b216810 Binary files /dev/null and b/charts/sptVSest_spt differ diff --git a/charts/taboo.png b/charts/taboo.png new file mode 100644 index 0000000..75c650c Binary files /dev/null and b/charts/taboo.png differ diff --git a/src/main/java/jobshop/solvers/TabooSolver.java b/src/main/java/jobshop/solvers/TabooSolver.java index f53e8ca..b3032b7 100644 --- a/src/main/java/jobshop/solvers/TabooSolver.java +++ b/src/main/java/jobshop/solvers/TabooSolver.java @@ -100,11 +100,11 @@ public class TabooSolver implements Solver { /* Check if we have a cycle */ if (isCycle(historic, result.toSchedule().get())){ System.out.println("CYCLE"); - break; + break; // remove to allow cycles } - System.out.println("\u001b[34m" + "Current makespam : " + result.toSchedule().get().makespan() + "\u001b[0m, " - + "\u001b[32m" + "Current best makespam : " + best + "\u001b[0m, " + System.out.println("\u001b[34m" + "Current makespan : " + result.toSchedule().get().makespan() + "\u001b[0m, " + + "\u001b[32m" + "Current best makespan : " + best + "\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"); // print to csv @@ -142,7 +142,7 @@ public class TabooSolver implements Solver { chart.addSeries("a", xData, makespansData); chart.addSeries("b", xData, bestData); - new SwingWrapper(chart).displayChart(); + new SwingWrapper(chart).displayChart(); // comment to remove chart display return bestRO.toSchedule(); }