Changeset 6412 for branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding

Timestamp:

06/14/11 14:53:14 (14 years ago)

Author:

jhelm

Message:

#1329: Did some minor changes affecting datatypes.

Location:

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3

Files:

• . (modified) (1 prop)
• Plugin.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (1 diff)
• ScheduleEncoding/Resource.cs (modified) (2 diffs)
• ScheduleEncoding/Schedule.cs (modified) (2 diffs)
• ScheduleEncoding/ScheduledTask.cs (modified) (4 diffs)

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/Plugin.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Encodings.ScheduleEncoding {
-  [Plugin("HeuristicLab.Encodings.ScheduleEncoding", "3.3.3.0")]
+  [Plugin("HeuristicLab.Encodings.ScheduleEncoding", "3.3.3.6406")]
   [PluginFile("HeuristicLab.Encodings.ScheduleEncoding-3.3.dll", PluginFileType.Assembly)]
   public class HeuristicLabEncodingsScheduleEncodingPlugin : PluginBase {

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/Properties/AssemblyInfo.cs

@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.3.0")]
+[assembly: AssemblyFileVersion("3.3.3.6406")]

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Resource.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -45 +44 @@
       set;
     }
-    public DoubleValue TotalDuration {
+    public double TotalDuration {
       get {
         double result = 0;
         foreach (ScheduledTask t in Tasks) {
-          if (t.EndTime.Value > result)
-            result = t.EndTime.Value;
+          if (t.EndTime > result)
+            result = t.EndTime;
         }
-        return new DoubleValue(result);
+        return result;
       }
     }

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Schedule.cs

@@ -117 +117 @@
     public void ScheduleTask(int resNr, double startTime, double duration, int jobNr) {
       ScheduledTask task = new ScheduledTask(resNr, startTime, duration, jobNr);
-      Resource affectedResource = resources[task.ResourceNr.Value];
+      Resource affectedResource = resources[task.ResourceNr];
       int i = 0;
-      while (i < affectedResource.Tasks.Count && affectedResource.Tasks[i].StartTime.Value < task.StartTime.Value)
+      while (i < affectedResource.Tasks.Count && affectedResource.Tasks[i].StartTime < task.StartTime)
         i++;
 
@@ -153 +153 @@
       double quality = 0;
       foreach (Resource r in Resources) {
-        if (r.TotalDuration.Value > quality) {
-          quality = r.TotalDuration.Value;
+        if (r.TotalDuration > quality) {
+          quality = r.TotalDuration;
         }
       }

branches/Scheduling/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/ScheduledTask.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -32 +31 @@
     #region Properties
     [Storable]
-    public IntValue ResourceNr { get; set; }
+    public int ResourceNr { get; set; }
     [Storable]
-    public DoubleValue Duration { get; set; }
+    public double Duration { get; set; }
     [Storable]
-    public DoubleValue StartTime { get; set; }
-    public DoubleValue EndTime {
+    public double StartTime { get; set; }
+    public double EndTime {
       get {
-        return new DoubleValue(Duration.Value + StartTime.Value);
+        return Duration + StartTime;
       }
     }
     [Storable]
-    public IntValue JobNr { get; set; }
+    public int JobNr { get; set; }
     #endregion
 
@@ -50 +49 @@
     protected ScheduledTask(ScheduledTask original, Cloner cloner)
       : base(original, cloner) {
-      this.ResourceNr = cloner.Clone(original.ResourceNr);
-      this.Duration = cloner.Clone(original.Duration);
-      this.StartTime = cloner.Clone(original.StartTime);
-      this.JobNr = cloner.Clone(original.JobNr);
+      this.ResourceNr = original.ResourceNr;
+      this.Duration = original.Duration;
+      this.StartTime = original.StartTime;
+      this.JobNr = original.JobNr;
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -61 +60 @@
     public ScheduledTask(int resNr, double startTime, double duration, int jobNr)
       : base() {
-      Duration = new DoubleValue(duration);
-      ResourceNr = new IntValue(resNr);
-      StartTime = new DoubleValue(startTime);
-      JobNr = new IntValue(jobNr);
+      Duration = duration;
+      ResourceNr = resNr;
+      StartTime = startTime;
+      JobNr = jobNr;
     }