Changeset 15493 for branches

Timestamp:

12/05/17 13:35:20 (6 years ago)

Author:

abeham

Message:

#2747: Implemeted hard-coded genetic algorithm for faster evaluation

Location:

branches/CFSAP

Files:

• HeuristicLab.Problems.Instances.CFSAP/3.3/BozejkoCFSAPInstanceProvider.cs (modified) (1 diff)
• HeuristicLab.Problems.Scheduling.CFSAP/3.3/CFSAP.cs (modified) (2 diffs)
• HeuristicLab.Problems.Scheduling.CFSAP/3.3/GeneticAlgorithm.cs (added)
• HeuristicLab.Problems.Scheduling.CFSAP/3.3/HeuristicLab.Problems.Scheduling.CFSAP-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.Scheduling.CFSAP/3.3/OptimalAssignment.cs (added)
• HeuristicLab.Problems.Scheduling.CFSAP/3.3/Plugin.cs.frame (modified) (1 diff)

branches/CFSAP/HeuristicLab.Problems.Instances.CFSAP/3.3/BozejkoCFSAPInstanceProvider.cs

@@ -62 +62 @@
       };
     }
+
     public override CFSAPData ImportData(string path) {
       var instance = LoadInstance(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite));

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

@@ -108 +108 @@
       var order = individual.Permutation("sequence");
       var assignment = individual.BinaryVector("assignment");
-      int T = EvaluateAssignement(order, assignment.Select(x => x ? 1 : 0).ToArray(),
-        ProcessingTimesParameter.Value, SetupTimesParameter.Value);
-      return T;
+      return Evaluate(order, assignment);
+    }
+
+    public int Evaluate(Permutation order, BinaryVector assignment) {
+      return EvaluateAssignement(order, assignment, ProcessingTimes, SetupTimes);
     }
 
@@ -130 +132 @@
           int operation = order[i];
           if (assignment[operation] == machine) {
+            if (first == -1)
+              first = operation;
+            else
+              T += setupTimes[machine][last, operation];
+            last = operation;
+          }
+        }
+        if (last != -1 && first != -1)
+          T += setupTimes[machine][last, first];
+      }
+
+      return T;
+    }
+
+    //Function to evaluate individual with the specified assignment
+    public static int EvaluateAssignement(Permutation order, BinaryVector assignment, IntMatrix processingTimes, ItemList<IntMatrix> setupTimes) {
+      if (processingTimes.Rows != 2) throw new ArgumentException("Method can only be used when there are two machines.", "assignment");
+      var N = order.Length;
+      int T = 0;
+
+      for (int i = 0; i < N; i++) {
+        int operation = order[i];
+        int machine = assignment[operation] ? 1 : 0;
+        T += processingTimes[machine, operation];
+      }
+
+      for (int machine = 0; machine < 2; machine++) {
+        int first = -1;
+        int last = -1;
+        for (int i = 0; i < N; i++) {
+          int operation = order[i];
+          if ((assignment[operation] ? 1 : 0) == machine) {
             if (first == -1)
               first = operation;

branches/CFSAP/HeuristicLab.Problems.Scheduling.CFSAP/3.3/HeuristicLab.Problems.Scheduling.CFSAP-3.3.csproj

@@ -103 +103 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="SimSharp-3.0.9, Version=3.0.9.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -121 +126 @@
     <Compile Include="CFSAP.cs" />
     <Compile Include="CFSAPSequenceOnly.cs" />
+    <Compile Include="GeneticAlgorithm.cs" />
     <Compile Include="ICFSAP.cs" />
     <Compile Include="MultiNestCFSAP.cs" />
     <Compile Include="MultiNestCFSAPSolvingStrategy.cs" />
+    <Compile Include="OptimalAssignment.cs" />
     <Compile Include="Plugin.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

branches/CFSAP/HeuristicLab.Problems.Scheduling.CFSAP/3.3/Plugin.cs.frame

@@ -38 +38 @@
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
+  [PluginDependency("HeuristicLab.Random", "3.3")]
   public class HeuristicLabProblemsSchedulingCFSAPPlugin : PluginBase  {
   }