Changeset 2834 for trunk/sources/HeuristicLab.Optimization

Timestamp:

02/19/10 06:19:16 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on operators, engines, and optimization

Location:

trunk/sources/HeuristicLab.Optimization

Files:

• . (added)
• 3.3 (added)
• 3.3/HeuristicLab.Optimization-3.3.csproj (added)
• 3.3/HeuristicLab.snk (added)
• 3.3/HeuristicLabOptimizationPlugin.cs.frame (added)
• 3.3/IProblem.cs (moved) (moved from trunk/sources/HeuristicLab.Core/3.3/Interfaces/IProblem.cs) (1 diff)
• 3.3/Problem.cs (moved) (moved from trunk/sources/HeuristicLab.Core/3.3/Problem.cs) (5 diffs)
• 3.3/Properties (added)
• 3.3/Properties/AssemblyInfo.frame (added)

trunk/sources/HeuristicLab.Optimization/3.3/IProblem.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Collections;
+using HeuristicLab.Core;
 
-namespace HeuristicLab.Core {
+namespace HeuristicLab.Optimization {
   /// <summary>
   /// Interface to represent a problem.
   /// </summary>
-  public interface IProblem : INamedItem {
-    IObservableKeyedCollection<string, IValueParameter> Parameters { get; }
-  }
+  public interface IProblem : INamedItem, IParameterizedItem { }
 }

trunk/sources/HeuristicLab.Optimization/3.3/Problem.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Core {
+namespace HeuristicLab.Optimization {
   /// <summary>
   /// The base class for all problems.
@@ -35 +35 @@
     }
 
-    private ValueParameterCollection parameters;
+    private ParameterCollection parameters;
     [Storable]
-    protected ValueParameterCollection Parameters {
+    protected ParameterCollection Parameters {
       get { return parameters;}
       private set {
@@ -46 +46 @@
       }
     }
-    private ReadOnlyObservableKeyedCollection<string, IValueParameter> readOnlyParameters;
-    IObservableKeyedCollection<string, IValueParameter> IProblem.Parameters {
+    private ReadOnlyObservableKeyedCollection<string, IParameter> readOnlyParameters;
+    IObservableKeyedCollection<string, IParameter> IParameterizedItem.Parameters {
       get {
         if (readOnlyParameters == null) readOnlyParameters = parameters.AsReadOnly();
@@ -56 +56 @@
     protected Problem() {
       Name = ItemName;
-      Parameters = new ValueParameterCollection();
+      Parameters = new ParameterCollection();
       readOnlyParameters = null;
     }
@@ -62 +62 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       Problem clone = (Problem)base.Clone(cloner);
-      clone.Parameters = (ValueParameterCollection)cloner.Clone(parameters);
+      clone.Parameters = (ParameterCollection)cloner.Clone(parameters);
       return clone;
     }