Changeset 4981 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces

Timestamp:

11/28/10 21:42:49 (13 years ago)

Author:

cneumuel

Message:

#1215 worked on metaoptimization

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces

Files:

• ICheckedValueConfigurationCollection.cs (added)
• IOptimizable.cs (added)
• IParameterConfiguration.cs (modified) (1 diff)
• IRange.cs (modified) (2 diffs)
• IValueConfiguration.cs (modified) (1 diff)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IParameterConfiguration.cs

@@ -2 +2 @@
 using HeuristicLab.Core;
 using System.Collections.Generic;
+using HeuristicLab.Data;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.MetaOptimization {
-  public interface IParameterConfiguration : INamedItem {
-    bool OptimizationEnabled { get; set; }
+  public interface IParameterConfiguration : IOptimizable, INamedItem {
     string ParameterName { get; set; }
     Type ParameterDataType { get; }
-    ICheckedItemList<IValueConfiguration> ValueConfigurations { get; }
+    ICheckedValueConfigurationCollection ValueConfigurations { get; }
     IValueConfiguration ActualValueConfiguration { get; set; }
-    Type ValueDataType { get; }
     IEnumerable<IItem> ValidValues { get; }
-
-    event EventHandler OptimizationEnabledChanged;
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IRange.cs

@@ -5 +5 @@
 
 namespace HeuristicLab.Problems.MetaOptimization {
-  public interface IRange<T> : IItem where T : class, IItem, IStringConvertibleValue, IDeepCloneable {
-    T LowerBound { get; set; }
-    T UpperBound { get; set; }
-    T StepSize { get; set; }
+  public interface IRange : IItem, IStringConvertibleValue {
+    object LowerBound { get; set; }
+    object UpperBound { get; set; }
+    object StepSize { get; set; }
 
     event EventHandler LowerBoundChanged;
@@ -14 +14 @@
     event EventHandler StepSizeChanged;
   }
+
+  public interface IRange<T> : IRange, IItem where T : class {
+    new T LowerBound { get; set; }
+    new T UpperBound { get; set; }
+    new T StepSize { get; set; }
+  }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IValueConfiguration.cs

@@ -1 +1 @@
 using System;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.MetaOptimization {
-  public interface IValueConfiguration : IItem {
-    IItem Value { get; set; }
-    Type ValueDataType { get; }
-    IItemList<IParameterConfiguration> ParameterConfigurations { get; }
-
+  public interface IValueConfiguration : IOptimizable, IItem {
+    IItemCollection<IParameterConfiguration> ParameterConfigurations { get; }
+    IRange RangeConstraint { get; }
     event EventHandler ValueChanged;
   }