Changeset 5080

Timestamp:

12/10/10 17:38:49 (13 years ago)

Author:

mkommend

Message:

Implemented wiring of problem specific analyzers in UserDefinedAlgorithms (ticket #1327)

Location:

trunk/sources

Files:

• HeuristicLab.Analysis/3.3/MultiAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IMultiOperator.cs (added)
• HeuristicLab.Operators/3.3/MultiOperator.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMultiAnalyzer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IAnalyzer.cs) (1 diff)
• HeuristicLab.Optimization/3.3/UserDefinedAlgorithm.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Analysis/3.3/MultiAnalyzer.cs

@@ -35 +35 @@
   [Item("MultiAnalyzer", "An analyzer which applies arbitrary many other analyzers.")]
   [StorableClass]
-  public class MultiAnalyzer : CheckedMultiOperator<IAnalyzer>, IAnalyzer {
+  public class MultiAnalyzer : CheckedMultiOperator<IAnalyzer>, IMultiAnalyzer {
     public override bool CanChangeName {
       get { return false; }

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

@@ -143 +143 @@
     <Compile Include="Constraints\IConstraint.cs" />
     <Compile Include="Constraints\TypeCompatibilityConstraint.cs" />
+    <Compile Include="Interfaces\IMultiOperator.cs" />
     <Compile Include="OperatorExecutionException.cs" />
     <Compile Include="Interfaces\IScopeTreeLookupParameter.cs" />

trunk/sources/HeuristicLab.Operators/3.3/MultiOperator.cs

@@ -34 +34 @@
   [Item("MultiOperator", "A base class for operators which apply arbitrary many other operators of a specific type.")]
   [StorableClass]
-  public abstract class MultiOperator<T> : SingleSuccessorOperator where T : class, IOperator {
+  public abstract class MultiOperator<T> : SingleSuccessorOperator, IMultiOperator<T> where T : class, IOperator {
     private List<IValueParameter<T>> operatorParameters;
 
@@ -68 +68 @@
       Initialize();
     }
-    
+
     private void Initialize() {
       if (operators != null) RegisterOperatorsEvents();

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

@@ -112 +112 @@
     <Compile Include="Algorithm.cs" />
     <Compile Include="BatchRun.cs" />
+    <Compile Include="Interfaces\IMultiAnalyzer.cs" />
     <Compile Include="Interfaces\IIterationBasedOperator.cs" />
     <Compile Include="Interfaces\IRealVectorDecoder.cs" />

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IMultiAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
+
 using HeuristicLab.Core;
-
 namespace HeuristicLab.Optimization {
   /// <summary>
-  /// An interface which represents an analysis operator.
+  /// An interface which represents an multi analysis operator.
   /// </summary>
-  public interface IAnalyzer : IOperator { }
+  public interface IMultiAnalyzer : IMultiOperator<IAnalyzer>, IAnalyzer { }
 }

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

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -50 +51 @@
     }
 
+    private IValueParameter AnalyzerParameter {
+      get { return (IValueParameter)Parameters["Analyzer"]; }
+    }
+    private IMultiAnalyzer Analyzer {
+      get {
+        if (AnalyzerParameter != null)
+          return AnalyzerParameter.Value as IMultiAnalyzer;
+        return null;
+      }
+    }
+
     public UserDefinedAlgorithm() : base() { }
     public UserDefinedAlgorithm(string name) : base(name) { }
@@ -64 +76 @@
       return new UserDefinedAlgorithm(this, cloner);
     }
+
+    #region update of problem specific analyzers
+    protected override void OnProblemChanged() {
+      AddProblemAnalyzer();
+      base.OnProblemChanged();
+    }
+    protected override void Problem_OperatorsChanged(object sender, System.EventArgs e) {
+      RemoveProblemAnalyzers();
+      AddProblemAnalyzer();
+      base.Problem_OperatorsChanged(sender, e);
+    }
+
+    protected override void DeregisterProblemEvents() {
+      RemoveProblemAnalyzers();
+      base.DeregisterProblemEvents();
+    }
+
+    private void RemoveProblemAnalyzers() {
+      if (Analyzer != null) {
+        foreach (var analyzer in Problem.Operators.OfType<IAnalyzer>())
+          Analyzer.Operators.Remove(analyzer);
+      }
+    }
+    private void AddProblemAnalyzer() {
+      if (Analyzer != null && Problem != null) {
+        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>()) {
+          Analyzer.Operators.Add(analyzer);
+        }
+      }
+    }
+    #endregion
   }
 }