Changeset 9151

Timestamp:

01/14/13 10:29:29 (12 years ago)

Author:

mkommend

Message:

#2003: Added new interface ICheckedMultiOperator and derived IMultiAnalyzer from it, to allow the UserDefinedAlgorithm to add disabled, problem dependent analyzer to its multi analyzer.

Location:

trunk/sources

Files:

• HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/ICheckedMultiOperator.cs (added)
• HeuristicLab.Optimization/3.3/Algorithms/UserDefinedAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMultiAnalyzer.cs (modified) (1 diff)

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

@@ -148 +148 @@
     <Compile Include="Constraints\IConstraint.cs" />
     <Compile Include="Constraints\TypeCompatibilityConstraint.cs" />
+    <Compile Include="Interfaces\ICheckedMultiOperator.cs" />
     <Compile Include="Interfaces\IConstrainedValueParameter.cs" />
     <Compile Include="Interfaces\IMultiOperator.cs" />

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

@@ -107 +107 @@
       if (Analyzer != null && Problem != null) {
         foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>()) {
-          Analyzer.Operators.Add(analyzer);
+          Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
         }
       }

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

@@ -26 +26 @@
   /// An interface which represents a multi analysis operator.
   /// </summary>
-  public interface IMultiAnalyzer : IMultiOperator<IAnalyzer>, IAnalyzer { }
+  public interface IMultiAnalyzer : ICheckedMultiOperator<IAnalyzer>, IAnalyzer { }
 }