Changeset 9178

Timestamp:

01/22/13 16:46:49 (12 years ago)

Author:

mkommend

Message:

#1996: Corrected OperatorGraph.Iterate to include AlgorithmOperators.

Location:

trunk/sources

Files:

• HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IOperatorGraphOperator.cs (added)
• HeuristicLab.Core/3.3/OperatorGraph.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/AlgorithmOperator.cs (modified) (1 diff)

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

@@ -152 +152 @@
     <Compile Include="Interfaces\IMultiOperator.cs" />
     <Compile Include="Interfaces\IFixedValueParameter.cs" />
+    <Compile Include="Interfaces\IOperatorGraphOperator.cs" />
     <Compile Include="Interfaces\IStatefulItem.cs" />
     <Compile Include="OperatorExecutionException.cs" />

trunk/sources/HeuristicLab.Core/3.3/OperatorGraph.cs

@@ -263 +263 @@
         visited.Add(current);
 
+        IOperatorGraphOperator operatorGraphOperator = current as IOperatorGraphOperator;
+        if (operatorGraphOperator != null) open.Push(operatorGraphOperator.OperatorGraph.InitialOperator);
+
         foreach (var parameter in current.Parameters.OfType<IValueParameter>()) {
           if (!typeof(IOperator).IsAssignableFrom(parameter.DataType)) continue;

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

@@ -31 +31 @@
   [Item("AlgorithmOperator", "An operator which represents an algorithm represented as an operator graph.")]
   [StorableClass]
-  public abstract class AlgorithmOperator : SingleSuccessorOperator {
+  public abstract class AlgorithmOperator : SingleSuccessorOperator, IOperatorGraphOperator {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }