Changeset 13469 for branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding.cs

Timestamp:

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

Author:

mkommend

Message:

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

File:

• branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding.cs (modified) (6 diffs)

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding.cs

@@ -34 +34 @@
 namespace HeuristicLab.Encodings.ScheduleEncoding {
   [StorableClass]
-  public abstract class ScheduleEncoding<TSchedule> : Encoding<ISchedule>, IScheduleEncoding
+  public abstract class ScheduleEncoding<TSchedule> : Encoding<TSchedule>, IScheduleEncoding
   where TSchedule : class, ISchedule {
     #region Encoding Parameters
@@ -85 +85 @@
 
     [Storable]
-    private IValueParameter<IScheduleDecoder> decoderParameter;
-
-    public IValueParameter<IScheduleDecoder> DecoderParameter {
+    private IValueParameter<IScheduleDecoder<TSchedule>> decoderParameter;
+    public IValueParameter<IScheduleDecoder<TSchedule>> DecoderParameter {
       get { return decoderParameter; }
       set {
@@ -114 +113 @@
     }
 
-    public IScheduleDecoder Decoder {
+    public IScheduleDecoder<TSchedule> Decoder {
       get { return DecoderParameter.Value; }
       set { DecoderParameter.Value = value; }
@@ -123 +122 @@
     protected ScheduleEncoding(ScheduleEncoding<TSchedule> original, Cloner cloner)
       : base(original, cloner) {
+      jobDataParameter = cloner.Clone(original.JobDataParameter);
+      jobsParameter = cloner.Clone(original.JobsParameter);
+      resourcesParameter = cloner.Clone(original.ResourcesParameter);
+      decoderParameter = cloner.Clone(original.DecoderParameter);
     }
 
@@ -135 +138 @@
       jobsParameter = new FixedValueParameter<IntValue>(Name + ".Jobs", new IntValue(jobs));
       resourcesParameter = new FixedValueParameter<IntValue>(Name + ".Resources", new IntValue(resources));
-      decoderParameter = new ValueParameter<IScheduleDecoder>(Name + ".Decoder");
+      decoderParameter = new ValueParameter<IScheduleDecoder<TSchedule>>(Name + ".Decoder");
 
       Parameters.Add(jobDataParameter);
@@ -163 +166 @@
 
     public override void ConfigureOperators(IEnumerable<IItem> operators) {
-      ConfigureCreators(operators.OfType<IScheduleCreator>());
+      ConfigureCreators(operators.OfType<IScheduleCreator<TSchedule>>());
       ConfigureCrossovers(operators.OfType<IScheduleCrossover>());
       ConfigureManipulators(operators.OfType<IScheduleManipulator>());
     }
 
-    private void ConfigureCreators(IEnumerable<IScheduleCreator> creators) {
+    private void ConfigureCreators(IEnumerable<IScheduleCreator<TSchedule>> creators) {
       foreach (var creator in creators) {
         creator.ScheduleParameter.ActualName = Name;