Changeset 13443 for branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem new.cs

Timestamp:

12/08/15 14:31:05 (8 years ago)

Author:

mkommend

Message:

#2521: Adapted decoders for SchedulingProblem.

File:

• branches/ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem new.cs (modified) (9 diffs)

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

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Encodings.Schedule;
 using HeuristicLab.Encodings.ScheduleEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.Instances;
 
@@ -95 +93 @@
       get { return (IFixedValueParameter<IntValue>)Parameters["Resources"]; }
     }
-    public IValueParameter<IScheduleEvaluator> ScheduleEvaluatorParameter {
-      get { return (IValueParameter<IScheduleEvaluator>)Parameters["ScheduleEvaluator"]; }
-    }
-    public OptionalValueParameter<IScheduleDecoder> ScheduleDecoderParameter {
-      get { return (OptionalValueParameter<IScheduleDecoder>)Parameters["ScheduleDecoder"]; }
-    }
     #endregion
 
@@ -118 +110 @@
       get { return ResourcesParameter.Value.Value; }
       set { ResourcesParameter.Value.Value = value; }
-    }
-    public IScheduleEvaluator ScheduleEvaluator {
-      get { return ScheduleEvaluatorParameter.Value; }
-      set { ScheduleEvaluatorParameter.Value = value; }
-    }
-    public IScheduleDecoder ScheduleDecoder {
-      get { return ScheduleDecoderParameter.Value; }
-      set { ScheduleDecoderParameter.Value = value; }
     }
     #endregion
@@ -151 +135 @@
       Parameters.Add(new FixedValueParameter<IntValue>("Jobs", "The number of jobs used in this JSSP instance.", new IntValue()));
       Parameters.Add(new FixedValueParameter<IntValue>("Resources", "The number of resources used in this JSSP instance.", new IntValue()));
-      Parameters.Add(new ValueParameter<IScheduleEvaluator>("ScheduleEvaluator", "The evaluator used to determine the quality of a solution.", new MakespanEvaluator()));
-      Parameters.Add(new OptionalValueParameter<IScheduleDecoder>("ScheduleDecoder", "The operator that decodes the representation and creates a schedule.", new JSMDecoder()));
 
       Encoding = new DirectScheduleEncoding();
@@ -162 +144 @@
 
     public override double Evaluate(ISchedule solution, IRandom random) {
-      //TODO change to decoder
-      var schedule = (Schedule)solution;
+      var schedule = Encoding.Decode(solution, JobData);
       return MakespanEvaluator.GetMakespan(schedule);
     }
@@ -194 +175 @@
     }
     private void ScheduleEvaluatorParameter_ValueChanged(object sender, EventArgs eventArgs) {
-      ScheduleEvaluator.QualityParameter.ActualNameChanged += ScheduleEvaluator_QualityParameter_ActualNameChanged;
+      //ScheduleEvaluator.QualityParameter.ActualNameChanged += ScheduleEvaluator_QualityParameter_ActualNameChanged;
       ParameterizeOperators();
     }
@@ -205 +186 @@
     }
     private void ScheduleDecoderParameter_ValueChanged(object sender, EventArgs eventArgs) {
-      if (ScheduleDecoder != null) ScheduleDecoder.ScheduleParameter.ActualNameChanged += ScheduleDecoder_ScheduleParameter_ActualNameChanged;
+      //if (ScheduleDecoder != null) ScheduleDecoder.ScheduleParameter.ActualNameChanged += ScheduleDecoder_ScheduleParameter_ActualNameChanged;
       ParameterizeOperators();
     }
@@ -222 +203 @@
 
     private void ApplyEncoding() {
-      if (SolutionCreator.GetType() == typeof(JSMRandomCreator)) {
-        Operators.AddRange(ApplicationManager.Manager.GetInstances<IJSMOperator>());
-        ScheduleDecoder = new JSMDecoder();
-      } else if (SolutionCreator.GetType() == typeof(PRVRandomCreator)) {
-        Operators.AddRange(ApplicationManager.Manager.GetInstances<IPRVOperator>());
-        ScheduleDecoder = new PRVDecoder();
-      } else if (SolutionCreator.GetType() == typeof(PWRRandomCreator)) {
-        Operators.AddRange(ApplicationManager.Manager.GetInstances<IPWROperator>());
-        ScheduleDecoder = new PWRDecoder();
-      } else if (SolutionCreator.GetType() == typeof(DirectScheduleRandomCreator)) {
-        Operators.AddRange(ApplicationManager.Manager.GetInstances<IDirectScheduleOperator>());
-        ScheduleDecoder = null;
-      }
+      //if (SolutionCreator.GetType() == typeof(JSMRandomCreator)) {
+      //  Operators.AddRange(ApplicationManager.Manager.GetInstances<IJSMOperator>());
+      //  ScheduleDecoder = new JSMDecoder();
+      //} else if (SolutionCreator.GetType() == typeof(PRVRandomCreator)) {
+      //  Operators.AddRange(ApplicationManager.Manager.GetInstances<IPRVOperator>());
+      //  ScheduleDecoder = new PRVDecoder();
+      //} else if (SolutionCreator.GetType() == typeof(PWRRandomCreator)) {
+      //  Operators.AddRange(ApplicationManager.Manager.GetInstances<IPWROperator>());
+      //  ScheduleDecoder = new PWRDecoder();
+      //} else if (SolutionCreator.GetType() == typeof(DirectScheduleRandomCreator)) {
+      //  Operators.AddRange(ApplicationManager.Manager.GetInstances<IDirectScheduleOperator>());
+      //  ScheduleDecoder = null;
+      //}
     }
 
@@ -301 +282 @@
       BestKnownQuality = data.BestKnownQuality ?? double.NaN;
       if (data.BestKnownSchedule != null) {
-        var enc = new JSMEncoding();
-        enc.JobSequenceMatrix = new ItemList<Permutation>(data.Resources);
+        var enc = new JSMEncoding(0);
         for (int i = 0; i < data.Resources; i++) {
-          enc.JobSequenceMatrix[i] = new Permutation(PermutationTypes.Absolute, new int[data.Jobs]);
+          enc.JobSequenceMatrix.Add(new Permutation(PermutationTypes.Absolute, new int[data.Jobs]));
           for (int j = 0; j < data.Jobs; j++) {
             enc.JobSequenceMatrix[i][j] = data.BestKnownSchedule[i, j];
           }
         }
-        BestKnownSolution = new JSMDecoder().CreateScheduleFromEncoding(enc, jobData);
-        if (ScheduleEvaluator is MeanTardinessEvaluator)
-          BestKnownQuality = MeanTardinessEvaluator.GetMeanTardiness(BestKnownSolution, jobData);
-        else if (ScheduleEvaluator is MakespanEvaluator)
-          BestKnownQuality = MakespanEvaluator.GetMakespan(BestKnownSolution);
+        BestKnownSolution = JSMDecoder.DecodeSchedule(enc, jobData, JSMDecodingErrorPolicyTypes.RandomPolicy, JSMForcingStrategyTypes.SwapForcing);
+        //if (ScheduleEvaluator is MeanTardinessEvaluator)
+        //  BestKnownQuality = MeanTardinessEvaluator.GetMeanTardiness(BestKnownSolution, jobData);
+        //else if (ScheduleEvaluator is MakespanEvaluator)
+        //  BestKnownQuality = MakespanEvaluator.GetMakespan(BestKnownSolution);
       }