Changeset 8887 for trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Crossovers

Timestamp:

11/11/12 22:57:09 (12 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

Location:

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Crossovers

Files:

• DirectScheduleCrossover.cs (modified) (3 diffs)
• DirectScheduleGTCrossover.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Crossovers/DirectScheduleCrossover.cs

@@ -28 +28 @@
   [Item("DirectScheduleCrossover", "An operator which crosses two schedule representations.")]
   [StorableClass]
-  public abstract class DirectScheduleCrossover : ScheduleCrossover<Schedule>, IDirectScheduleOperator {
+  public abstract class DirectScheduleCrossover : ScheduleCrossover, IDirectScheduleOperator {
     [StorableConstructor]
     protected DirectScheduleCrossover(bool deserializing) : base(deserializing) { }
@@ -39 +39 @@
     }
 
-
     public ILookupParameter<ItemList<Job>> JobDataParameter {
       get { return (LookupParameter<ItemList<Job>>)Parameters["JobData"]; }
@@ -47 +46 @@
 
     public override IOperation Apply() {
-      ItemArray<Schedule> parents = ParentsParameter.ActualValue;
+      var parents = ParentsParameter.ActualValue;
       ChildParameter.ActualValue =
         Cross(RandomParameter.ActualValue, parents[0] as Schedule, parents[1] as Schedule);

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Crossovers/DirectScheduleGTCrossover.cs

@@ -30 +30 @@
   [StorableClass]
   public class DirectScheduleGTCrossover : DirectScheduleCrossover {
+
+    public IValueLookupParameter<DoubleValue> MutationProbabilityParameter {
+      get { return (IValueLookupParameter<DoubleValue>)Parameters["MutationProbability"]; }
+    }
+
     [StorableConstructor]
     protected DirectScheduleGTCrossover(bool deserializing) : base(deserializing) { }
-    protected DirectScheduleGTCrossover(DirectScheduleGTCrossover original, Cloner cloner)
-      : base(original, cloner) {
+    protected DirectScheduleGTCrossover(DirectScheduleGTCrossover original, Cloner cloner) : base(original, cloner) { }
+    public DirectScheduleGTCrossover()
+      : base() {
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("MutationProbability", "The probability that a task from the conflict set is chosen randomly instead of from one of the parents."));
     }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new DirectScheduleGTCrossover(this, cloner);
     }
-    public DirectScheduleGTCrossover()
-      : base() {
-      Parameters.Add(new LookupParameter<PercentValue>("MutationProbability", "The probability that the mutation operator is applied on a solution."));
-    }
-
-
-    private LookupParameter<PercentValue> MutationProbabilityParameter {
-      get { return (LookupParameter<PercentValue>)Parameters["MutationProbability"]; }
-    }
-
 
     public static Schedule Apply(IRandom random, Schedule parent1, Schedule parent2, ItemList<Job> jobData, double mutProp) {
-      Schedule child = new Schedule(parent1.Resources.Count);
-
+      var child = new Schedule(parent1.Resources.Count);
 
       //Reset scheduled tasks in result
@@ -75 +72 @@
         int progressOnResource = conflictedResource.Tasks.Count;
         Task selectedTask = null;
-        if (random.Next(100) < mutProp) {
+        if (random.NextDouble() < mutProp) {
           //Mutation
           selectedTask = conflictSet[random.Next(conflictSet.Count)];
@@ -95 +92 @@
     }
 
-
     private static Task SelectTaskFromConflictSet(ItemList<Task> conflictSet, Schedule usedParent, int conflictedResourceNr, int progressOnResource) {
       //Apply Crossover
@@ -109 +105 @@
 
     public override Schedule Cross(IRandom random, Schedule parent1, Schedule parent2) {
-      ItemList<Job> jobData = (ItemList<Job>)JobDataParameter.ActualValue.Clone();
-      PercentValue mutProp = MutationProbabilityParameter.ActualValue;
+      var jobData = (ItemList<Job>)JobDataParameter.ActualValue.Clone();
+      var mutProp = MutationProbabilityParameter.ActualValue;
       return Apply(random, parent1, parent2, jobData, mutProp.Value);
     }