Changeset 2845 for trunk/sources/HeuristicLab.Optimization

Timestamp:

02/20/10 20:04:08 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameterized items

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• HeuristicLab.Optimization-3.3.csproj (modified) (2 diffs)
• HeuristicLabOptimizationPlugin.cs.frame (modified) (1 diff)
• IAlgorithm.cs (added)
• IProblem.cs (modified) (1 diff)
• Problem.cs (modified) (2 diffs)

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

@@ -51 +51 @@
   <ItemGroup>
     <None Include="HeuristicLabOptimizationPlugin.cs.frame" />
+    <Compile Include="IAlgorithm.cs" />
     <Compile Include="HeuristicLabOptimizationPlugin.cs" />
     <Compile Include="IProblem.cs" />
@@ -68 +69 @@
       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
       <Name>HeuristicLab.Common.Resources-3.2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj">
+      <Project>{1FC004FC-59AF-4249-B1B6-FF25873A20E4}</Project>
+      <Name>HeuristicLab.Common-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">

trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLabOptimizationPlugin.cs.frame

@@ -29 +29 @@
   [PluginFile("HeuristicLab.Optimization-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Common", "3.2")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.2")]
   [PluginDependency("HeuristicLab.Core", "3.3")]

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

@@ -26 +26 @@
   /// Interface to represent a problem.
   /// </summary>
-  public interface IProblem : INamedItem, IParameterizedItem { }
+  public interface IProblem : IParameterizedNamedItem { }
 }

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

@@ -21 +21 @@
 
 using System.Drawing;
-using HeuristicLab.Collections;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Optimization {
@@ -30 +28 @@
   /// </summary>
   [Item("Problem", "Base class for problems.")]
-  public abstract class Problem : NamedItem, IProblem {
+  public abstract class Problem : ParameterizedNamedItem, IProblem {
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
     }
 
-    private ParameterCollection parameters;
-    [Storable]
-    protected ParameterCollection Parameters {
-      get { return parameters;}
-      private set {
-        if (parameters != null) parameters.Changed -= new ChangedEventHandler(Parameters_Changed);
-        parameters = value;
-        readOnlyParameters = null;
-        if (parameters != null) parameters.Changed += new ChangedEventHandler(Parameters_Changed);
-      }
-    }
-    private ReadOnlyObservableKeyedCollection<string, IParameter> readOnlyParameters;
-    IObservableKeyedCollection<string, IParameter> IParameterizedItem.Parameters {
-      get {
-        if (readOnlyParameters == null) readOnlyParameters = parameters.AsReadOnly();
-        return readOnlyParameters;
-      }
-    }
-
-    protected Problem() {
-      Name = ItemName;
-      Parameters = new ParameterCollection();
-      readOnlyParameters = null;
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      Problem clone = (Problem)base.Clone(cloner);
-      clone.Parameters = (ParameterCollection)cloner.Clone(parameters);
-      return clone;
-    }
-
-    private void Parameters_Changed(object sender, ChangedEventArgs e) {
-      OnChanged(e);
-    }
+    protected Problem() : base() { }
+    protected Problem(string name) : base(name) { }
+    protected Problem(string name, ParameterCollection parameters) : base(name, parameters) { }
+    protected Problem(string name, string description) : base(name, description) { }
+    protected Problem(string name, string description, ParameterCollection parameters) : base(name, description, parameters) { }
   }
 }