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

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

File:

• trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Resource.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Resource.cs

@@ -29 +29 @@
   [StorableClass]
   public class Resource : Item {
-    public Resource(int index)
-      : base() {
-      Index = index;
-      Tasks = new ItemList<ScheduledTask>();
-    }
+
     [Storable]
     public int Index {
@@ -44 +40 @@
       set;
     }
+
+    [StorableConstructor]
+    protected Resource(bool deserializing) : base(deserializing) { }
+    protected Resource(Resource original, Cloner cloner)
+      : base(original, cloner) {
+      this.Index = original.Index;
+      this.Tasks = cloner.Clone(original.Tasks);
+    }
+    public Resource(int index)
+      : base() {
+      Index = index;
+      Tasks = new ItemList<ScheduledTask>();
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Resource(this, cloner);
+    }
+
     public double TotalDuration {
       get {
@@ -53 +67 @@
         return result;
       }
-    }
-
-    [StorableConstructor]
-    protected Resource(bool deserializing) : base(deserializing) { }
-    protected Resource(Resource original, Cloner cloner)
-      : base(original, cloner) {
-      this.Index = original.Index;
-      this.Tasks = cloner.Clone(original.Tasks);
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Resource(this, cloner);
     }
 
@@ -83 +86 @@
         return false;
     }
+
     public override int GetHashCode() {
       if (Tasks.Count == 1)
@@ -90 +94 @@
       return 0;
     }
+
     private static bool AreEqual(Resource res1, Resource res2) {
       if (res1.Tasks.Count != res2.Tasks.Count)