Changeset 5843

Timestamp:

03/28/11 17:22:36 (14 years ago)

Author:

mkommend

Message:

#1049: Added code to create default values in ValueParameters if possible.

Location:

trunk/sources/HeuristicLab.Parameters/3.3

Files:

• FixedValueParameter.cs (modified) (2 diffs)
• ValueParameter.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Parameters/3.3/FixedValueParameter.cs

@@ -31 +31 @@
   [Item("FixedValueParameter", "A parameter whose value is defined in the parameter itself and cannot be set.")]
   [StorableClass]
-  public class FixedValueParameter<T> : ValueParameter<T>, IFixedValueParameter<T> where T : class,IItem {
+  public class FixedValueParameter<T> : ValueParameter<T>, IFixedValueParameter<T> where T : class,IItem, new() {
 
     public override T Value {
@@ -44 +44 @@
     protected FixedValueParameter(FixedValueParameter<T> original, Cloner cloner) : base(original, cloner) { }
 
-    public FixedValueParameter(string name) : base(name, default(T)) { }
-    public FixedValueParameter(string name, bool getsCollected) : base(name, default(T), getsCollected) { }
+    public FixedValueParameter() : base() { }
+    public FixedValueParameter(string name) : base(name) { }
+    public FixedValueParameter(string name, bool getsCollected) : base(name, getsCollected) { }
     public FixedValueParameter(string name, T value) : base(name, value) { }
     public FixedValueParameter(string name, T value, bool getsCollected) : base(name, value, getsCollected) { }
-    public FixedValueParameter(string name, string description) : base(name, description, default(T)) { }
-    public FixedValueParameter(string name, string description, bool getsCollected) : base(name, description, default(T), getsCollected) { }
+    public FixedValueParameter(string name, string description) : base(name, description) { }
+    public FixedValueParameter(string name, string description, bool getsCollected) : base(name, description, getsCollected) { }
     public FixedValueParameter(string name, string description, T value) : base(name, description, value) { }
     public FixedValueParameter(string name, string description, T value, bool getsCollected) : base(name, description, value, getsCollected) { }

trunk/sources/HeuristicLab.Parameters/3.3/ValueParameter.cs

@@ -21 +21 @@
 
 using System;
+using System.Reflection;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -43 +44 @@
     protected ValueParameter(bool deserializing) : base(deserializing) { }
     protected ValueParameter(ValueParameter<T> original, Cloner cloner) : base(original, cloner) { }
+
     public ValueParameter() : base() { }
-    public ValueParameter(string name) : base(name) { }
-    public ValueParameter(string name, bool getsCollected) : base(name, getsCollected) { }
+    public ValueParameter(string name) : base(name) { base.Value = CreateDefaultValue(); }
+    public ValueParameter(string name, bool getsCollected) : base(name, getsCollected) { base.Value = CreateDefaultValue(); }
     public ValueParameter(string name, T value) : base(name, value) { }
     public ValueParameter(string name, T value, bool getsCollected) : base(name, value, getsCollected) { }
-    public ValueParameter(string name, string description) : base(name, description) { }
-    public ValueParameter(string name, string description, bool getsCollected) : base(name, description, getsCollected) { }
+    public ValueParameter(string name, string description) : base(name, description) { base.Value = CreateDefaultValue(); }
+    public ValueParameter(string name, string description, bool getsCollected) : base(name, description, getsCollected) { base.Value = CreateDefaultValue(); }
     public ValueParameter(string name, string description, T value) : base(name, description, value) { }
     public ValueParameter(string name, string description, T value, bool getsCollected) : base(name, description, value, getsCollected) { }
+
+    protected T CreateDefaultValue() {
+      ConstructorInfo defaultConstructor = typeof(T).GetConstructor(Type.EmptyTypes);
+      if (defaultConstructor != null)
+        return (T)defaultConstructor.Invoke(new object[0]);
+      return null;
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {