Changeset 6475 for branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3

Timestamp:

06/24/11 14:23:19 (13 years ago)

Author:

jhelm

Message:

#1329: Added DirectSchedule-Classes for optimization with the direct-schedule encoding.

Location:

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3

Files:

• Evaluators/SchedulingEvaluationAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Problems.Scheduling-3.3.csproj (modified) (2 diffs)
• Interfaces/IJSSPOperator.cs (modified) (1 diff)
• Job.cs (deleted)
• JobShopSchedulingProblem.cs (modified) (1 diff)
• Plugin.cs (modified) (1 diff)
• Task.cs (deleted)

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Evaluators/SchedulingEvaluationAlgorithm.cs

@@ -54 +54 @@
     }
 
+    public void InitializeOperatorGraph<T>() where T : Item, IScheduleEncoding {
+      OperatorGraph.Operators.Clear();
+      OperatorGraph.InitialOperator = evaluator;
+    }
+
     public void InitializeOperatorGraph<T>(ScheduleDecoder<T> decoder) where T : Item, IScheduleEncoding {
       OperatorGraph.Operators.Clear();

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

@@ -50 +50 @@
     <Compile Include="Analyzers\BestSchedulingSolutionAnalyzer.cs" />
     <Compile Include="Analyzers\SchedulingAnalyzer.cs" />
-    <Compile Include="Decoders\GTAlgorithmUtils.cs" />
     <Compile Include="Decoders\JSMDecoder.cs" />
     <Compile Include="Decoders\JSMDecodingErrorPolicyTypes.cs" />
@@ -60 +59 @@
     <Compile Include="Evaluators\SchedulingEvaluator.cs" />
     <Compile Include="Interfaces\IJSSPOperator.cs" />
-    <Compile Include="Job.cs" />
     <Compile Include="JobShopSchedulingProblem.cs" />
     <Compile Include="Evaluators\SchedulingEvaluationAlgorithm.cs" />
-    <Compile Include="Task.cs" />
     <Compile Include="SchedulingProblem.cs" />
     <Compile Include="Plugin.cs" />

branches/Scheduling/HeuristicLab.Problems.Scheduling/3.3/Interfaces/IJSSPOperator.cs

@@ -1 +1 @@
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.ScheduleEncoding;
 
 namespace HeuristicLab.Problems.Scheduling {

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

@@ -173 +173 @@
             PWRDecoder decoder = new PWRDecoder();
             ((SchedulingEvaluationAlgorithm)this.EvaluatorParameter.ActualValue).InitializeOperatorGraph<PWREncoding>(decoder);
+          } else {
+            if (SolutionCreator.GetType().Equals(typeof(DirectScheduleRandomCreator))) {
+              Operators.AddRange(ApplicationManager.Manager.GetInstances<IDirectScheduleOperator>());
+              ((SchedulingEvaluationAlgorithm)this.EvaluatorParameter.ActualValue).InitializeOperatorGraph<Schedule>();
+            }
           }
         }

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

@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.Scheduling {
-  [Plugin("HeuristicLab.Problems.Scheduling", "3.3.3.6412")]
+  [Plugin("HeuristicLab.Problems.Scheduling", "3.3.3.6414")]
   [PluginFile("HeuristicLab.Problems.Scheduling-3.3.dll", PluginFileType.Assembly)]
   public class HeuristicLabProblemsSchedulingPlugin : PluginBase {