Changeset 14029 for branches/crossvalidation-2434/HeuristicLab.Encodings.ScheduleEncoding

Timestamp:

07/08/16 14:40:02 (8 years ago)

Author:

gkronber

Message:

#2434: merged trunk changes r12934:14026 from trunk to branch

Location:

branches/crossvalidation-2434

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Schedule.cs (modified) (3 diffs)

branches/crossvalidation-2434/HeuristicLab.Encodings.ScheduleEncoding/3.3/Plugin.cs.frame

@@ -23 +23 @@
 
 namespace HeuristicLab.Encodings.ScheduleEncoding {
-  [Plugin("HeuristicLab.Encodings.ScheduleEncoding", "3.3.12.$WCREV$")]
+  [Plugin("HeuristicLab.Encodings.ScheduleEncoding", "3.3.13.$WCREV$")]
   [PluginFile("HeuristicLab.Encodings.ScheduleEncoding-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/crossvalidation-2434/HeuristicLab.Encodings.ScheduleEncoding/3.3/Properties/AssemblyInfo.cs.frame

@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.13.$WCREV$")]

branches/crossvalidation-2434/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Schedule.cs

@@ -31 +31 @@
   [Item("Schedule", "Represents the general solution for scheduling problems.")]
   [StorableClass]
-  public class Schedule : NamedItem, IScheduleEncoding {
+  public sealed class Schedule : NamedItem, IScheduleEncoding {
 
     #region Properties
@@ -63 +63 @@
 
     [StorableConstructor]
-    protected Schedule(bool deserializing) : base(deserializing) { }
-    protected Schedule(Schedule original, Cloner cloner)
+    private Schedule(bool deserializing) : base(deserializing) { }
+    private Schedule(Schedule original, Cloner cloner)
       : base(original, cloner) {
       this.Resources = cloner.Clone(original.Resources);
@@ -71 +71 @@
     }
     public Schedule(int nrOfResources) {
+      Name = "Schedule";
+
       Resources = new ItemList<Resource>();
       for (int i = 0; i < nrOfResources; i++) {