Changeset 13469 for branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling

Timestamp:

12/15/15 15:16:24 (8 years ago)

Author:

mkommend

Message:

#2521: Refactored problem base classes and adapted scheduling encoding, scheduling problem and unit tests.

Location:

branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3

Files:

• HeuristicLab.Problems.Scheduling-3.3.csproj (modified) (2 diffs)
• JobShopSchedulingProblem new.cs (modified) (4 diffs)
• Plugin.cs.frame (modified) (1 diff)

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

@@ -158 +158 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
-      <Project>{DDFB14DD-2A85-493C-A52D-E69729BBAEB0}</Project>
-      <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
       <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
@@ -201 +196 @@
       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
       <Name>HeuristicLab.Problems.Instances-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
-      <Project>{f4539fb6-4708-40c9-be64-0a1390aea197}</Project>
-      <Name>HeuristicLab.Random-3.3</Name>
       <Private>False</Private>
     </ProjectReference>

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

@@ -96 +96 @@
 
     #region Properties
+
     public ItemList<Job> JobData {
       get { return JobDataParameter.Value; }
@@ -166 +167 @@
 
     #region Events
-    protected override void OnSolutionCreatorChanged() {
-      //SolutionCreator.ScheduleParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
-      //InitializeOperators();
-    }
+    //protected override void OnSolutionCreatorChanged() {
+    //SolutionCreator.ScheduleParameter.ActualNameChanged += SolutionCreator_SchedulingEncodingParameter_ActualNameChanged;
+    //InitializeOperators();
+    //}
     protected override void OnEvaluatorChanged() {
       base.OnEvaluatorChanged();
@@ -196 +197 @@
     #region Helpers
     private void InitializeOperators() {
-      Operators.Clear();
-      ApplyEncoding();
+      //ApplyEncoding();
       Operators.Add(new BestSchedulingSolutionAnalyzer());
       ParameterizeOperators();
@@ -289 +289 @@
           }
         }
-        BestKnownSolution = JSMDecoder.DecodeSchedule(enc, jobData, JSMDecodingErrorPolicy.RandomPolicy, JSMForcingStrategy.SwapForcing);
+        BestKnownSolution = JSMDecoder.Decode(enc, jobData, JSMDecodingErrorPolicy.RandomPolicy, JSMForcingStrategy.SwapForcing);
         //if (ScheduleEvaluator is MeanTardinessEvaluator)
         //  BestKnownQuality = MeanTardinessEvaluator.GetMeanTardiness(BestKnownSolution, jobData);

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

@@ -30 +30 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
-  [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.ScheduleEncoding", "3.3")]