Changeset 2890 for trunk/sources/HeuristicLab.Parameters

Timestamp:

03/01/10 03:01:01 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on algorithms, problems and parameters

Location:

trunk/sources/HeuristicLab.Parameters/3.3

Files:

• HeuristicLab.Parameters-3.3.csproj (modified) (1 diff)
• OperatorParameter.cs (modified) (1 diff)
• OptionalValueParameter.cs (moved) (moved from trunk/sources/HeuristicLab.Parameters/3.3/ValueParameter.cs) (3 diffs)

trunk/sources/HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj

@@ -69 +69 @@
     <Compile Include="ConstrainedValueParameter.cs" />
     <Compile Include="LookupParameter.cs" />
+    <Compile Include="OptionalValueParameter.cs" />
     <Compile Include="SubScopesLookupParameter.cs" />
     <Compile Include="ValueLookupParameter.cs" />
-    <Compile Include="ValueParameter.cs" />
     <Compile Include="ScopeParameter.cs" />
     <Compile Include="HeuristicLabParametersPlugin.cs" />

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

@@ -30 +30 @@
   [EmptyStorableClass]
   [Creatable("Test")]
-  public class OperatorParameter : ValueParameter<IOperator> {
+  public class OperatorParameter : OptionalValueParameter<IOperator> {
     public OperatorParameter()
       : base("Anonymous") {

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

@@ -27 +27 @@
 namespace HeuristicLab.Parameters {
   /// <summary>
-  /// A parameter whose value is defined it the parameter itself.
+  /// A parameter whose value is defined it the parameter itself. The value of the parameter can be null, if the parameter is not set.
   /// </summary>
-  [Item("ValueParameter<T>", "A parameter whose value is defined it the parameter itself.")]
-  public class ValueParameter<T> : Parameter, IValueParameter<T> where T : class, IItem {
+  [Item("OptionalValueParameter<T>", "A parameter whose value is defined it the parameter itself. The value of the parameter can be null, if the parameter is not set.")]
+  public class OptionalValueParameter<T> : Parameter, IValueParameter<T> where T : class, IItem {
     private T value;
     [Storable]
@@ -57 +57 @@
     }
 
-    public ValueParameter()
+    public OptionalValueParameter()
       : base("Anonymous", typeof(T)) {
     }
-    public ValueParameter(string name)
+    public OptionalValueParameter(string name)
       : base(name, typeof(T)) {
     }
-    public ValueParameter(string name, T value)
+    public OptionalValueParameter(string name, T value)
       : base(name, typeof(T)) {
       Value = value;
     }
-    public ValueParameter(string name, string description)
+    public OptionalValueParameter(string name, string description)
       : base(name, description, typeof(T)) {
     }
-    public ValueParameter(string name, string description, T value)
+    public OptionalValueParameter(string name, string description, T value)
       : base(name, description, typeof(T)) {
       Value = value;
@@ -76 +76 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      ValueParameter<T> clone = (ValueParameter<T>)base.Clone(cloner);
+      OptionalValueParameter<T> clone = (OptionalValueParameter<T>)base.Clone(cloner);
       clone.Value = (T)cloner.Clone(value);
       return clone;