Changeset 8887 for trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JSMRandomCreator.cs

Timestamp:

11/11/12 22:57:09 (11 years ago)

Author:

abeham

Message:

#1329:

• Moved decoders and evaluators from encoding to problem
• Removed unnecessary state variables in operators
• Introduced parameters in interfaces and added wiring code
• Removed ConcreteScheduleManipulator as it does not perform any manipulation
• Made ErrorPolicy and ForcingStrategy configurable and added views for them
• Renamed the SchedulingEvaluationAlgorithm and also converted the AlgorithmOperator to a SingleSuccessorOperator
• Fixed Plugin- and AssemblyFileVersion
• Added missing license headers

File:

• trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JSMRandomCreator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JSMRandomCreator.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-
 namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
   [Item("JobSequenceMatrixCreator", "Creator class used to create Job Sequence Matrix solutions for standard JobShop scheduling problems.")]
   [StorableClass]
-  public class JSMRandomCreator : ScheduleCreator<JSMEncoding>, IStochasticOperator {
-    #region Parameter Properties
+  public class JSMRandomCreator : ScheduleCreator, IStochasticOperator {
+
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
@@ -43 +42 @@
       get { return (IValueLookupParameter<IntValue>)Parameters["Resources"]; }
     }
-    #endregion
-
 
     [StorableConstructor]
     protected JSMRandomCreator(bool deserializing) : base(deserializing) { }
-    protected JSMRandomCreator(JSMRandomCreator original, Cloner cloner)
-      : base(original, cloner) {
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new JSMRandomCreator(this, cloner);
-    }
+    protected JSMRandomCreator(JSMRandomCreator original, Cloner cloner) : base(original, cloner) { }
     public JSMRandomCreator()
       : base() {
@@ -63 +55 @@
     }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new JSMRandomCreator(this, cloner);
+    }
 
     public static JSMEncoding Apply(int jobs, int resources, IRandom random) {
-      JSMEncoding solution = new JSMEncoding();
-
+      var solution = new JSMEncoding();
       for (int i = 0; i < resources; i++) {
         solution.JobSequenceMatrix.Add(new Permutation(PermutationTypes.Absolute, jobs, random));
       }
-
       return solution;
     }
 
-
-    protected override JSMEncoding CreateSolution() {
+    protected override IScheduleEncoding CreateSolution() {
       return Apply(JobsParameter.ActualValue.Value, ResourcesParameter.ActualValue.Value, RandomParameter.ActualValue);
     }