Changeset 10801 for branches/HeuristicLab.EvolutionTracking

Timestamp:

05/06/14 17:20:32 (11 years ago)

Author:

bburlacu

Message:

#1772: Fixed invalid cast exception in BeforeManipulatorOperator.cs

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs

@@ -59 +59 @@
         var parents = vChild.Parents;
         // if there's a fragment, save it 
-        IFragment fragment = null;
-        if (vChild.InArcs.Last().Data != null) {
-          fragment = (IFragment<T>)vChild.InArcs.Last().Data;
-        }
         vChild.InArcs = new List<IGenealogyGraphArc>();
         foreach (var p in parents) {
@@ -72 +68 @@
         vChild.AddReverseArc(vClone);
         vClone.AddForwardArc(vChild);
-        vClone.InArcs.Last().Data = fragment;
+        vClone.InArcs.Last().Data = vChild.InArcs.Last().Data;
+
       } else { // this needs to be checked
         var vChild = new GenealogyGraphNode<T> { Content = ChildParameter.ActualValue, Rank = Generations.Value };

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

@@ -237 +237 @@
       <DependentUpon>GraphicalSymbolicDataAnalysisModelView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Symbols\ConstantView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="Symbols\ConstantView.cs" />
     <Compile Include="Symbols\ConstantView.Designer.cs">
       <DependentUpon>ConstantView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Symbols\LaggedVariableView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="Symbols\LaggedVariableView.cs" />
     <Compile Include="Symbols\LaggedVariableView.Designer.cs">
       <DependentUpon>LaggedVariableView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Symbols\TimeLagView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="Symbols\TimeLagView.cs" />
     <Compile Include="Symbols\TimeLagView.Designer.cs">
       <DependentUpon>TimeLagView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Symbols\VariableConditionView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="Symbols\VariableConditionView.cs" />
     <Compile Include="Symbols\VariableConditionView.Designer.cs">
       <DependentUpon>VariableConditionView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Symbols\VariableView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="Symbols\VariableView.cs" />
     <Compile Include="Symbols\VariableView.Designer.cs">
       <DependentUpon>VariableView.cs</DependentUpon>