Changeset 15533 for branches/CFSAP/HeuristicLab.Problems.Scheduling.CFSAP/3.3/OptimalPolynomialAssignment.cs

Timestamp:

12/18/17 14:38:18 (6 years ago)

Author:

ddorfmei

Message:

#2747: Improved hard-coded genetic algorithm

• implemented restart strategy
• implemented 1-Opt algorithm
• added parameters to control restart strategy and optimal assignment strategy
• additional results: best solution found after number of generations, jobs/nests (for evaluation only)

File:

• branches/CFSAP/HeuristicLab.Problems.Scheduling.CFSAP/3.3/OptimalPolynomialAssignment.cs (moved) (moved from branches/CFSAP/HeuristicLab.Problems.Scheduling.CFSAP/3.3/OptimalAssignment.cs) (4 diffs)

branches/CFSAP/HeuristicLab.Problems.Scheduling.CFSAP/3.3/OptimalPolynomialAssignment.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Problems.Scheduling.CFSAP {
-  public static class OptimalAssignment {
+  public static class OptimalPolynomialAssignment {
 
     public static int[] MakeAssignment(Permutation order, IntMatrix processingTimes, ItemList<IntMatrix> setupTimes, out int T) {
@@ -33 +33 @@
       int[,,] weights = new int[2, 2 * N, 2 * N];
       int[,] graph = new int[2, N];
-      int[,] prevPath = new int[2, N + 1];                     //Only for optimal assignment evaluation
-      int[] optimalAssignment = new int[N];                //Only for optimal assignment evaluation
+      int[,] prevPath = new int[2, N + 1];    //Only for optimal assignment evaluation
+      int[] optimalAssignment = new int[N];   //Only for optimal assignment evaluation
 
       //Calculate weights in the graph
-      for (int S = 0; S < N; S++) { //Starting point of the arc
-        for (int sM = 0; sM < 2; sM++) {    //Starting point machine
+      for (int S = 0; S < N; S++) {        //Starting point of the arc
+        for (int sM = 0; sM < 2; sM++) {   //Starting point machine
           int eM = sM == 0 ? 1 : 0;
           weights[sM, S, S + 1] = 0;
@@ -87 +87 @@
           if (newT < T) {
             T = newT;
-            optimalAssignment = MakeAssignement(S, SM, prevPath, order);
+            optimalAssignment = MakeAssignment(S, SM, prevPath, order);
           }
         }
@@ -104 +104 @@
     }
 
-    private static int[] MakeAssignement(int start, int startMach, int[,] prevPath, Permutation order) {
+    private static int[] MakeAssignment(int start, int startMach, int[,] prevPath, Permutation order) {
       var N = order.Length;
       int[] assignment = Enumerable.Repeat(-1, N).ToArray();