Changeset 13449

Timestamp:

12/11/15 12:53:43 (9 years ago)

Author:

pfleck

Message:

#2521

• Replaced JSMDecodingErrorPolicy and JSMForcingStrategy with EnumValues.
• Removed obsolete views for the scheduling enums.

Location:

branches/ProblemRefactoring

Files:

• HeuristicLab.Encodings.ScheduleEncoding/3.3/HeuristicLab.Encodings.ScheduleEncoding-3.3.csproj (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMDecoder.cs (modified) (6 diffs)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMDecodingErrorPolicy.cs (moved) (moved from branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMDecodingErrorPolicyTypes.cs) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMForcingStrategy.cs (moved) (moved from branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMForcingStrategyTypes.cs) (1 diff)
• HeuristicLab.Problems.Scheduling.Views/3.3/HeuristicLab.Problems.Scheduling.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Scheduling.Views/3.3/JSMDecodingErrorPolicyView.Designer.cs (deleted)
• HeuristicLab.Problems.Scheduling.Views/3.3/JSMDecodingErrorPolicyView.cs (deleted)
• HeuristicLab.Problems.Scheduling.Views/3.3/JSMForcingStrategyView.Designer.cs (deleted)
• HeuristicLab.Problems.Scheduling.Views/3.3/JSMForcingStrategyView.cs (deleted)
• HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem new.cs (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/HeuristicLab.Encodings.ScheduleEncoding-3.3.csproj

@@ -118 +118 @@
     <Compile Include="JobSequenceMatrix\Decoder\JSMDecoder.cs" />
     <Compile Include="JobSequenceMatrix\Decoder\JSMDecodingErrorPolicy.cs" />
-    <Compile Include="JobSequenceMatrix\Decoder\JSMDecodingErrorPolicyTypes.cs" />
     <Compile Include="JobSequenceMatrix\Decoder\JSMForcingStrategy.cs" />
-    <Compile Include="JobSequenceMatrix\Decoder\JSMForcingStrategyTypes.cs" />
     <Compile Include="PriorityRulesVector\Decoder\PRVDecoder.cs" />
     <Compile Include="PermutationWithRepetition\Decoder\PWRDecoder.cs" />

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMDecoder.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Parameters;
@@ -35 +36 @@
   public class JSMDecoder : ScheduleDecoder {
 
-    public IValueParameter<JSMDecodingErrorPolicy> DecodingErrorPolicyParameter {
-      get { return (IValueParameter<JSMDecodingErrorPolicy>)Parameters["DecodingErrorPolicy"]; }
+    public IFixedValueParameter<EnumValue<JSMDecodingErrorPolicy>> DecodingErrorPolicyParameter {
+      get { return (IFixedValueParameter<EnumValue<JSMDecodingErrorPolicy>>)Parameters["DecodingErrorPolicy"]; }
     }
-    public IValueParameter<JSMForcingStrategy> ForcingStrategyParameter {
-      get { return (IValueParameter<JSMForcingStrategy>)Parameters["ForcingStrategy"]; }
+    public IFixedValueParameter<EnumValue<JSMForcingStrategy>> ForcingStrategyParameter {
+      get { return (IFixedValueParameter<EnumValue<JSMForcingStrategy>>)Parameters["ForcingStrategy"]; }
     }
 
-    private JSMDecodingErrorPolicyTypes DecodingErrorPolicy {
+    private JSMDecodingErrorPolicy DecodingErrorPolicy {
       get { return DecodingErrorPolicyParameter.Value.Value; }
     }
 
-    private JSMForcingStrategyTypes ForcingStrategy {
+    private JSMForcingStrategy ForcingStrategy {
       get { return ForcingStrategyParameter.Value.Value; }
     }
@@ -59 +60 @@
     public JSMDecoder()
       : base() {
-      Parameters.Add(new ValueParameter<JSMDecodingErrorPolicy>("DecodingErrorPolicy", "Specify the policy that should be used to handle decoding errors.", new JSMDecodingErrorPolicy(JSMDecodingErrorPolicyTypes.RandomPolicy)));
-      Parameters.Add(new ValueParameter<JSMForcingStrategy>("ForcingStrategy", "Specifies a forcing strategy.", new JSMForcingStrategy(JSMForcingStrategyTypes.SwapForcing)));
+      Parameters.Add(new FixedValueParameter<EnumValue<JSMDecodingErrorPolicy>>("DecodingErrorPolicy", "Specify the policy that should be used to handle decoding errors.", new EnumValue<JSMDecodingErrorPolicy>(JSMDecodingErrorPolicy.RandomPolicy)));
+      Parameters.Add(new FixedValueParameter<EnumValue<JSMForcingStrategy>>("ForcingStrategy", "Specifies a forcing strategy.", new EnumValue<JSMForcingStrategy>(JSMForcingStrategy.SwapForcing)));
     }
 
-    private static Task SelectTaskFromConflictSet(JSMEncoding solution, JSMDecodingErrorPolicyTypes decodingErrorPolicy, JSMForcingStrategyTypes forcingStrategy, int conflictedResourceNr, int progressOnConflictedResource, ItemList<Task> conflictSet, IRandom random) {
+    private static Task SelectTaskFromConflictSet(JSMEncoding solution, JSMDecodingErrorPolicy decodingErrorPolicy, JSMForcingStrategy forcingStrategy, int conflictedResourceNr, int progressOnConflictedResource, ItemList<Task> conflictSet, IRandom random) {
       if (conflictSet.Count == 1)
         return conflictSet[0];
@@ -89 +90 @@
     }
 
-    private static Task ApplyDecodingErrorPolicy(JSMDecodingErrorPolicyTypes decodingErrorPolicy, ItemList<Task> conflictSet, Permutation resource, int progress, IRandom random) {
-      if (decodingErrorPolicy == JSMDecodingErrorPolicyTypes.RandomPolicy) {
+    private static Task ApplyDecodingErrorPolicy(JSMDecodingErrorPolicy decodingErrorPolicy, ItemList<Task> conflictSet, Permutation resource, int progress, IRandom random) {
+      if (decodingErrorPolicy == JSMDecodingErrorPolicy.RandomPolicy) {
         //Random
         return conflictSet[random.Next(conflictSet.Count - 1)];
@@ -107 +108 @@
     }
 
-    private static void ApplyForcingStrategy(JSMForcingStrategyTypes forcingStrategy, JSMEncoding solution, int conflictedResource, int newResolutionIndex, int progressOnResource, int newResolution) {
+    private static void ApplyForcingStrategy(JSMForcingStrategy forcingStrategy, JSMEncoding solution, int conflictedResource, int newResolutionIndex, int progressOnResource, int newResolution) {
       var jsm = solution.JobSequenceMatrix;
-      if (forcingStrategy == JSMForcingStrategyTypes.SwapForcing) {
+      if (forcingStrategy == JSMForcingStrategy.SwapForcing) {
         //SwapForcing
         jsm[conflictedResource][newResolutionIndex] = jsm[conflictedResource][progressOnResource];
         jsm[conflictedResource][progressOnResource] = newResolution;
-      } else if (forcingStrategy == JSMForcingStrategyTypes.ShiftForcing) {
+      } else if (forcingStrategy == JSMForcingStrategy.ShiftForcing) {
         //ShiftForcing
         List<int> asList = jsm[conflictedResource].ToList<int>();
@@ -135 +136 @@
     }
 
-    public static Schedule DecodeSchedule(JSMEncoding solution, ItemList<Job> jobData, JSMDecodingErrorPolicyTypes decodingErrorPolicy, JSMForcingStrategyTypes forcingStrategy) {
+    public static Schedule DecodeSchedule(JSMEncoding solution, ItemList<Job> jobData, JSMDecodingErrorPolicy decodingErrorPolicy, JSMForcingStrategy forcingStrategy) {
       var random = new FastRandom(solution.RandomSeed);
       var jobs = (ItemList<Job>)jobData.Clone();

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMDecodingErrorPolicy.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Encodings.ScheduleEncoding {
-  public enum JSMDecodingErrorPolicyTypes {
+  public enum JSMDecodingErrorPolicy {
     RandomPolicy,
     GuidedPolicy

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMForcingStrategy.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Encodings.ScheduleEncoding {
-  public enum JSMForcingStrategyTypes {
+  public enum JSMForcingStrategy {
     ShiftForcing,
     SwapForcing

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

@@ -116 +116 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="JSMForcingStrategyView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="JSMForcingStrategyView.Designer.cs">
-      <DependentUpon>JSMForcingStrategyView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="JobShopSchedulingProblemView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="JobShopSchedulingProblemView.cs" />
     <Compile Include="JobShopSchedulingProblemView.Designer.cs">
       <DependentUpon>JobShopSchedulingProblemView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="JSMDecodingErrorPolicyView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="JSMDecodingErrorPolicyView.Designer.cs">
-      <DependentUpon>JSMDecodingErrorPolicyView.cs</DependentUpon>
     </Compile>
     <Compile Include="Plugin.cs" />

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

@@ -289 +289 @@
           }
         }
-        BestKnownSolution = JSMDecoder.DecodeSchedule(enc, jobData, JSMDecodingErrorPolicyTypes.RandomPolicy, JSMForcingStrategyTypes.SwapForcing);
+        BestKnownSolution = JSMDecoder.DecodeSchedule(enc, jobData, JSMDecodingErrorPolicy.RandomPolicy, JSMForcingStrategy.SwapForcing);
         //if (ScheduleEvaluator is MeanTardinessEvaluator)
         //  BestKnownQuality = MeanTardinessEvaluator.GetMeanTardiness(BestKnownSolution, jobData);