Changeset 9184 for branches/UnloadJobs/HeuristicLab.Core

Timestamp:

01/23/13 14:08:38 (12 years ago)

Author:

ascheibe

Message:

#2005 merged changes from trunk into branch

Location:

branches/UnloadJobs

Files:

• . (modified) (1 prop)
• HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IOperatorGraphOperator.cs (copied) (copied from trunk/sources/HeuristicLab.Core/3.3/Interfaces/IOperatorGraphOperator.cs)
• HeuristicLab.Core/3.3/OperatorGraph.cs (modified) (1 diff)

branches/UnloadJobs/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" />

branches/UnloadJobs/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;