Changeset 10269

Timestamp:

12/23/13 11:42:24 (11 years ago)

Author:

bburlacu

Message:

#1772: Added HeuristicLab.Problems.DataAnalysis.Symbolic and HeuristicLab.Problems.DataAnalysis.Symbolic.Views and integrated some modifications from the old branch.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (copied) (copied from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (copied) (copied from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj (modified) (11 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeLatexFormatter.cs (added)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj (modified) (10 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/IFragment.cs (added)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ILayoutAdapter.cs (added)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ILayoutNode.cs (added)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNodeComparer.cs (added)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNodeSimilarityComparer.cs (added)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/LayoutEngines (added)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/LayoutEngines/LayoutNode.cs (added)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/LayoutEngines/ReingoldTilfordLayoutEngine.cs (added)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/LayoutEngines/SymbolicExpressionTreeLayoutAdapter.cs (added)
• HeuristicLab.EvolutionTracking.Views/3.4/ExtendedSymbolicExpressionTreeCanvas.cs (deleted)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.Designer.cs (modified) (2 diffs)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs (modified) (11 diffs)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphDialog.Designer.cs (deleted)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphDialog.cs (deleted)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphView.Designer.cs (modified) (5 diffs)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphView.cs (modified) (8 diffs)
• HeuristicLab.EvolutionTracking.Views/3.4/HeuristicLab.EvolutionTracking.Views-3.4.csproj (modified) (5 diffs)
• HeuristicLab.EvolutionTracking.Views/3.4/LineageExplorerView.Designer.cs (deleted)
• HeuristicLab.EvolutionTracking.Views/3.4/LineageExplorerView.cs (deleted)
• HeuristicLab.EvolutionTracking.Views/3.4/Primitives/LabeledEllipse.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking.Views/3.4/Primitives/LabeledRectangle.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking.Views/3.4/VisualGenealogyGraphNode.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/HeuristicLab.EvolutionTracking-3.4.csproj (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/HeuristicLab.EvolutionTracking-3.4.csproj.user (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/HeuristicLab.EvolutionaryTracking.sln.docstates.suo (deleted)
• HeuristicLab.Problems.DataAnalysis.Symbolic (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4 (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/GraphicalSymbolicDataAnalysisModelView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/GraphicalSymbolicDataAnalysisModelView.designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj.user (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.snk (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MathSymbolicDataAnalysisModelView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MathSymbolicDataAnalysisModelView.designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MenuItems (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MenuItems/ExportSymbolicSolutionToExcelMenuItem.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MenuItems/OptimizeDataAnalysisRunsMenuItem.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs.frame (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Properties (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Properties/AssemblyInfo.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SlidingWindowDataView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SlidingWindowDataView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/ConstantView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/ConstantView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/LaggedVariableView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/LaggedVariableView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/TimeLagView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/TimeLagView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TextualSymbolicDataAnalysisModelView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TextualSymbolicDataAnalysisModelView.designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeConstantNodeEditDialog.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeConstantNodeEditDialog.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeNodeInsertDialog.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeNodeInsertDialog.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeVariableNodeEditDialog.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeVariableNodeEditDialog.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/displayModelFrame.html (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (10 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/GenerationalSlidingWindowAnalyzer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/OffspringSelectionSlidingWindowAnalyzer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowAnalyzer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowData.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowQualitiesAnalyzer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowVisualizer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisSolutionPruningOptimizer.cs (added)
• HeuristicLab.Tracking.sln (modified) (4 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj

@@ -41 +41 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -50 +50 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -58 +58 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -66 +66 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -76 +76 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -84 +84 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -93 +93 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Collections-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Core-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Core.Views-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Data-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Data.Views-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data.Views-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.MainForm-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization.Views-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Random-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -162 +222 @@
     <Compile Include="VisualSymbolicExpressionTreeNode.cs" />
     <Compile Include="VisualSymbolicExpressionTreeNodeConnection.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
-      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
-      <Name>HeuristicLab.Collections-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
-      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
-      <Name>HeuristicLab.Common.Resources-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
-      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
-      <Name>HeuristicLab.Common-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
-      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
-      <Name>HeuristicLab.Core.Views-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
-      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
-      <Name>HeuristicLab.Core-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
-      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
-      <Name>HeuristicLab.Data.Views-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
-      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
-      <Name>HeuristicLab.Data-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
-      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
-      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
-      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
-      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
-      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
-      <Name>HeuristicLab.MainForm-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
-      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
-      <Name>HeuristicLab.Operators-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
-      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
-      <Name>HeuristicLab.Optimization.Views-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
-      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
-      <Name>HeuristicLab.Optimization-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
-      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
-      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
-      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
-      <Name>HeuristicLab.Random-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
-      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
-      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -267 +245 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
+      <Project>{06d4a186-9319-48a0-bade-a2058d462eea}</Project>
+      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.EvolutionTracking\3.4\HeuristicLab.EvolutionTracking-3.4.csproj">
+      <Project>{1f75cea3-464f-4a6f-b2f0-04b9841ebc16}</Project>
+      <Name>HeuristicLab.EvolutionTracking-3.4</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -276 +264 @@
   -->
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -283 +271 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj

@@ -41 +41 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -51 +51 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -59 +59 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -67 +67 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -77 +77 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -85 +85 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -94 +94 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Analysis-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Collections-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Core-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Data-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Parameters-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Random-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -135 +186 @@
     <Compile Include="Creators\RampedHalfAndHalfTreeCreator.cs" />
     <Compile Include="Formatters\SymbolicExpressionTreeGraphvizFormatter.cs" />
+    <Compile Include="Interfaces\IFragment.cs" />
+    <Compile Include="Interfaces\ILayoutAdapter.cs" />
+    <Compile Include="Interfaces\ILayoutNode.cs" />
     <Compile Include="Interfaces\IReadOnlySymbol.cs" />
     <Compile Include="Interfaces\ISymbolicExpressionGrammar.cs" />
     <Compile Include="Interfaces\ISymbolicExpressionGrammarBase.cs" />
     <Compile Include="Interfaces\ISymbolicExpressionTreeGrammar.cs" />
+    <Compile Include="Interfaces\ISymbolicExpressionTreeNodeComparer.cs" />
+    <Compile Include="Interfaces\ISymbolicExpressionTreeNodeSimilarityComparer.cs" />
     <Compile Include="Interfaces\Operators\ISymbolicExpressionTreeArchitectureAlteringOperator.cs" />
     <Compile Include="Interfaces\Operators\ISymbolicExpressionTreeGrammarBasedOperator.cs" />
@@ -154 +210 @@
     <Compile Include="Interfaces\ISymbolicExpressionTreeStringFormatter.cs" />
     <Compile Include="Interfaces\Operators\ISymbolicExpressionTreeSizeConstraintOperator.cs" />
+    <Compile Include="LayoutEngines\LayoutNode.cs" />
+    <Compile Include="LayoutEngines\ReingoldTilfordLayoutEngine.cs" />
+    <Compile Include="LayoutEngines\SymbolicExpressionTreeLayoutAdapter.cs" />
     <Compile Include="Manipulators\ChangeNodeTypeManipulation.cs" />
     <Compile Include="Interfaces\Operators\ISymbolicExpressionTreeManipulator.cs" />
@@ -195 +254 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
-      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
-      <Name>HeuristicLab.Analysis-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
-      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
-      <Name>HeuristicLab.Collections-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
-      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
-      <Name>HeuristicLab.Common.Resources-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
-      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
-      <Name>HeuristicLab.Common-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
-      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
-      <Name>HeuristicLab.Core-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
-      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
-      <Name>HeuristicLab.Data-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
-      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
-      <Name>HeuristicLab.Operators-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
-      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
-      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
-      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
-      <Name>HeuristicLab.Optimization-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
-      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
-      <Name>HeuristicLab.Parameters-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
-      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
-      <Name>HeuristicLab.Persistence-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
-      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
-      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
-      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
-      <Name>HeuristicLab.Random-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.Designer.cs

@@ -1 @@
-#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-namespace HeuristicLab.EvolutionaryTracking.Views {
+namespace HeuristicLab.EvolutionaryTracking.Views {
   partial class GenealogyGraphChart {
     /// <summary> 
@@ -45 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-      this.SuspendLayout();
-      // 
-      // pictureBox
-      // 
-      this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
-      this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-      // 
-      // GenealogyGraphChart
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      components = new System.ComponentModel.Container();
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Name = "GenealogyGraphChart";
-      this.Controls.SetChildIndex(this.pictureBox, 0);
-      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-      this.ResumeLayout(false);
-
     }
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs

@@ -1 @@
-#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -27 +6 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Visualization;
 
 namespace HeuristicLab.EvolutionaryTracking.Views {
   public partial class GenealogyGraphChart : ChartControl {
-    private Dictionary<string, VisualGenealogyGraphNode> visualNodeMap; // map the uid of the genealogy graph vertex with a visual node (in this way each node is uniquely determined)
-    private Dictionary<Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>, VisualGenealogyGraphArc> visualArcMap;
-    private const int Diameter = 20; // node diameter
-    private int x, y; // coordinates for positioning each node
-    private const int Cx = 30, Cy = 30; // position increments
-    private VisualGenealogyGraphNode selectedGenealogyGraphNode;
-    public VisualGenealogyGraphNode SelectedGenealogyGraphNode { get { return selectedGenealogyGraphNode; } }
-    private Visualization.Rectangle targetRectangle; // provides a  rectangle mark of the currently selected genealogy graph node
+    private GenealogyGraph genealogyGraph;
+
+    private const double XIncrement = 30;
+    private const double YIncrement = 30;
+    private const double Diameter = 20;
+
+    public GenealogyGraph GenealogyGraph {
+      get { return genealogyGraph; }
+      set {
+        if (value == null) return;
+        genealogyGraph = value;
+        Clear();
+        DrawGraph(XIncrement, YIncrement, Diameter);
+      }
+    }
+
+    private void Clear() {
+      if (nodeMap == null)
+        nodeMap = new Dictionary<IGenealogyGraphNode, VisualGenealogyGraphNode>();
+      else nodeMap.Clear();
+
+      if (arcMap == null)
+        arcMap = new Dictionary<Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>, VisualGenealogyGraphArc>();
+      else arcMap.Clear();
+
+      Chart.Group.Clear();
+    }
+
+    private Dictionary<IGenealogyGraphNode, VisualGenealogyGraphNode> nodeMap;
+    private Dictionary<Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>, VisualGenealogyGraphArc> arcMap;
 
     public bool SimpleLineages { get; set; }
     public bool LockGenealogy { get; set; }
-
-    private bool drawing;
-
-    private SymbolicExpressionTreeGenealogyGraph graph;
-    public SymbolicExpressionTreeGenealogyGraph Graph {
-      get { return graph; }
-      internal set {
-        graph = value;
-        if (graph == null) return;
-
-        visualNodeMap = new Dictionary<string, VisualGenealogyGraphNode>();
-        visualArcMap = new Dictionary<Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>, VisualGenealogyGraphArc>();
-
-        Chart.Group.Clear();
-        DrawGraph();
-      }
-    }
-
-    private VisualGenealogyGraphNode GetVisualGenealogyGraphNode(IVertex node) {
-      VisualGenealogyGraphNode visualNode;
-      visualNodeMap.TryGetValue(node.Id, out visualNode);
-      return visualNode;
-    }
-
-    private VisualGenealogyGraphArc GetVisualGenealogyGraphArc(IVertex source, IVertex target) {
-      VisualGenealogyGraphNode visualSource;
-      VisualGenealogyGraphNode visualTarget;
-      visualNodeMap.TryGetValue(source.Id, out visualSource);
-      visualNodeMap.TryGetValue(target.Id, out visualTarget);
-      if (visualSource != null && visualTarget != null) {
-        VisualGenealogyGraphArc visualArc;
-        visualArcMap.TryGetValue(
-          new Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>(visualSource, visualTarget), out visualArc);
-        if (visualArc != null) return visualArc;
-      }
-      return null;
-    }
+    private Visualization.Rectangle TargetRectangle { get; set; }
+
+    private VisualGenealogyGraphNode GetMappedNode(IGenealogyGraphNode node) {
+      VisualGenealogyGraphNode v;
+      nodeMap.TryGetValue(node, out v);
+      return v;
+    }
+
+    private VisualGenealogyGraphArc GetMappedArc(IGenealogyGraphNode source, IGenealogyGraphNode target) {
+      VisualGenealogyGraphNode visualSource, visualTarget;
+      nodeMap.TryGetValue(source, out visualSource);
+      nodeMap.TryGetValue(target, out visualTarget);
+
+      if (visualSource == null || visualTarget == null) return null;
+
+      VisualGenealogyGraphArc arc;
+      arcMap.TryGetValue(new Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>(visualSource, visualTarget), out arc);
+      return arc;
+    }
+
+    private bool DrawInProgress { get; set; } // do not try to update the chart while the drawing is not finished
+    private VisualGenealogyGraphNode SelectedVisualNode { get; set; }
 
     public event MouseEventHandler GenealogyGraphNodeClicked;
@@ -88 +73 @@
 
     public GenealogyGraphChart() {
-      //      InitializeComponent();
-      Chart = new Chart(0, 0, PreferredSize.Width, PreferredSize.Height);
-      x = 0;
-      y = PreferredSize.Height + Cx + 2 * Diameter;
-      Chart.Mode = ChartMode.Select;
-    }
-
-    public void DrawGraph() {
-      if (graph == null) return;
+      InitializeComponent();
+    }
+
+    protected virtual void DrawGraph(double xIncrement, double yIncrement, double diameter) {
       Chart.UpdateEnabled = false;
-
-      drawing = true;
-
-      var layers = Graph.Nodes.GroupBy(n => n.Rank).OrderBy(g => g.Key).Select(g => new { Rank = g.Key, Nodes = g.ToList() }).ToList();
-
-      y = PreferredSize.Height + Cx + 2 * Diameter;
-
-      for (int i = 0; i != layers.Count; ++i) {
-        x = 0;
-        layers[i].Nodes.Sort((b, a) => Graph.Compare(a, b));
-        double rank = Math.Floor(layers[i].Rank);
-        if (layers[i].Rank.IsAlmost(rank)) {
-          var visualTextNode = new VisualGenealogyGraphTextLabel(Chart, x, y + 2, x + Diameter, y + Diameter) {
-            FontBrush = new SolidBrush(Color.Black),
-            Font = new Font("Arial", Diameter - 4, FontStyle.Regular, GraphicsUnit.Pixel),
-            Text = String.Format("{0:0}", rank)
-          };
-          Chart.Group.Add(visualTextNode);
-        }
-
-        // sort descending by quality (using comparison defined in GenealogyGraphNode class)
-        x += (int)Math.Floor(1.5 * Cx); // reset horizontal coordinate
-
-        foreach (var node in layers[i].Nodes) {
+      DrawInProgress = true;
+
+      var ranks = GenealogyGraph.Ranks.Select(t => new { Rank = t.Key, Nodes = t.Value }).OrderBy(p => p.Rank).ToList();
+      double x = 0;
+      double y = PreferredSize.Height + yIncrement + 2 * diameter;
+
+      foreach (var rank in ranks) {
+        var nodes = rank.Nodes.ToList();
+        nodes.Sort((a, b) => b.CompareTo(a)); // sort descending by quality
+        var nl = Environment.NewLine;
+
+        foreach (var node in nodes) {
           var pen = new Pen(Color.LightGray);
-          var nl = Environment.NewLine;
-          var visualNode = new VisualGenealogyGraphNode(Chart, x, y, x + Diameter, y + Diameter, pen, null) {
+
+          var visualNode = new VisualGenealogyGraphNode(Chart, x, y, x + diameter, y + diameter, pen, null) {
             Data = node,
             ToolTipText = "Rank: " + node.Rank + nl +
@@ -131 +99 @@
           };
           Chart.Group.Add(visualNode);
-          visualNodeMap.Add(node.Id, visualNode);
-
-          x += Cx; // increment horizontal coordinate
-        }
-
-        y -= Cy; // decrement vertical coordinate (because the origin is upside down)
-
-        // connect elites from successive layers with visual arcs
-        if (i == 0) continue;
-        var currLayer = layers[i].Nodes;
-        var prevLayer = layers[i - 1].Nodes;
-        foreach (var n in currLayer) {
-          foreach (var m in prevLayer) {
-            if (n.SymbolicExpressionTree != m.SymbolicExpressionTree) continue;
-            var v1 = GetVisualGenealogyGraphNode(n);
-            var v2 = GetVisualGenealogyGraphNode(m);
-
-            var pen = new Pen(Color.LightGray);
-            visualArcMap[Tuple.Create(v2, v1)] = AddArc(Chart, v2, v1, pen);
-          }
-        }
-      }
-      // add arcs separately (to avoid some ordering problems)
-      foreach (SymbolicExpressionTreeGenealogyGraphNode node in Graph.Nodes) {
-        VisualGenealogyGraphNode visualNode = GetVisualGenealogyGraphNode(node);
-        if (node.InEdges == null) continue;
-
-        foreach (Arc arc in node.InEdges) {
-          var visualParent = GetVisualGenealogyGraphNode(arc.Source);
+          nodeMap.Add(node, visualNode);
+
+          x += xIncrement;
+        }
+        y -= yIncrement;
+      }
+      // add arcs
+      foreach (var node in GenealogyGraph.Nodes) {
+        if (node.InArcs == null) continue;
+        var visualNode = nodeMap[node];
+        if (visualNode == null) continue;
+        foreach (var arc in node.InArcs) {
+          var parent = arc.Source;
+          var visualParent = GetMappedNode(parent);
+          if (visualParent == null) continue;
           var pen = new Pen(Color.Transparent);
-          visualArcMap[Tuple.Create(visualParent, visualNode)] = AddArc(Chart, visualParent, visualNode, pen);
-        }
-      }
-
-      // highlight the most recent common ancestor ("eve" individual)
-      //      var eve = graph.MostRecentCommonAncestor();
-      //      if (eve != null) {
-      //        var visualGraphNode = GetVisualGenealogyGraphNode(eve);
-
-      //        var brush = new SolidBrush(Color.BlueViolet);
-      //        visualGraphNode.FontBrush = brush;
-      //      }
-
-      Chart.UpdateEnabled = true;
-      Chart.EnforceUpdate();
-
-      drawing = false;
-    }
-
-    // add an arc between the source and the target nodes, using the specified pen color
-    // adds the arc to the arc lists of both nodes and to the primitive group of the chart
-    private static VisualGenealogyGraphArc AddArc(IChart chart, VisualGenealogyGraphNode source, VisualGenealogyGraphNode target, Pen pen, Brush brush = null) {
-      var arc = new VisualGenealogyGraphArc(chart, source, target, pen) { Brush = brush };
-      arc.UpdatePosition();
-      source.OutgoingArcs.Add(arc);
-      target.IncomingArcs.Add(arc);
-      chart.Group.Add(arc);
-      return arc;
-    }
-
-    protected override void pictureBox_MouseMove(object sender, MouseEventArgs e) {
-      if (!drawing) {
+          var visualArc = AddArc(Chart, visualParent, visualNode, pen);
+          arcMap.Add(Tuple.Create(visualParent, visualNode), visualArc);
+        }
+      }
+      // TODO: connect elites
+
+      Chart.UpdateEnabled = true;
+      Chart.EnforceUpdate();
+
+      DrawInProgress = false;
+    }
+
+    protected override void pictureBox_MouseMove(object sender, System.Windows.Forms.MouseEventArgs e) {
+      if (!DrawInProgress) {
         switch (e.Button) {
           case MouseButtons.Left:
@@ -203 +139 @@
             break;
         }
-        base.pictureBox_MouseMove(sender, e);
-      }
+      }
+      base.pictureBox_MouseMove(sender, e);
     }
 
@@ -213 +149 @@
         return;
       }
-
       if (Chart.Mode != ChartMode.Select) {
         base.pictureBox_MouseUp(sender, e);
         return;
       }
-
       var visualNodes = Chart.GetAllPrimitives(e.Location).Where(p => p is VisualGenealogyGraphNode).ToList();
       if (visualNodes.Count <= 0) {
-        selectedGenealogyGraphNode = null;
+        SelectedVisualNode = null;
         return;
       }
-      if (selectedGenealogyGraphNode == visualNodes[0]) return;
-      selectedGenealogyGraphNode = visualNodes[0] as VisualGenealogyGraphNode;
-      if (selectedGenealogyGraphNode == null) return;
+      if (SelectedVisualNode == visualNodes[0]) return;
+      SelectedVisualNode = visualNodes[0] as VisualGenealogyGraphNode;
+      if (SelectedVisualNode == null) return;
 
       if (!LockGenealogy) {
@@ -233 +167 @@
         if (ModifierKeys != Keys.Shift)
           // clear colors
-          ClearAllNodes();
+          ClearPrimitives();
         // use a rectangle to highlight the currently selected genealogy graph node
-        var gNode = selectedGenealogyGraphNode.Data;
-        var visualNode = GetVisualGenealogyGraphNode(gNode);
+        var gNode = SelectedVisualNode.Data;
+        var visualNode = GetMappedNode(gNode);
 
         DrawLineage(visualNode, n => SimpleLineages ? n.IncomingArcs.Take(1) : n.IncomingArcs, a => a.Source);
@@ -249 +183 @@
       Chart.EnforceUpdate();
 
-      if (selectedGenealogyGraphNode != null)
+      if (SelectedVisualNode != null)
         /* emit clicked event */
-        OnGenealogyGraphNodeClicked(selectedGenealogyGraphNode, e);
+        OnGenealogyGraphNodeClicked(SelectedVisualNode, e);
+
+      base.pictureBox_MouseUp(sender, e);
     }
 
@@ -273 +209 @@
 
     void MarkSelectedNode() {
-      var center = selectedGenealogyGraphNode.Center;
-      var size = selectedGenealogyGraphNode.Size;
+      var center = SelectedVisualNode.Center;
+      var size = SelectedVisualNode.Size;
       double x1 = center.X - size.Width / 2;
       double x2 = x1 + size.Width;
       double y1 = center.Y - size.Height / 2;
       double y2 = y1 + size.Height;
-      if (targetRectangle == null) {
-        targetRectangle = new Visualization.Rectangle(Chart, x1, y1, x2, y2, new Pen(Color.Black), null);
-        Chart.Group.Add(targetRectangle);
+      if (TargetRectangle == null) {
+        TargetRectangle = new Visualization.Rectangle(Chart, x1, y1, x2, y2, new Pen(Color.Black), null);
+        Chart.Group.Add(TargetRectangle);
       } else {
-        targetRectangle.SetPosition(x1, y1, x2, y2);
-      }
-    }
-
-    public void ClearAllNodes() {
+        TargetRectangle.SetPosition(x1, y1, x2, y2);
+      }
+    }
+
+
+    private static VisualGenealogyGraphArc AddArc(IChart chart, VisualGenealogyGraphNode source, VisualGenealogyGraphNode target, Pen pen, Brush brush = null) {
+      var arc = new VisualGenealogyGraphArc(chart, source, target, pen) { Brush = brush };
+      arc.UpdatePosition();
+      source.OutgoingArcs.Add(arc);
+      target.IncomingArcs.Add(arc);
+      chart.Group.Add(arc);
+      return arc;
+    }
+
+    public virtual void ClearPrimitives() {
       foreach (var primitive in Chart.Group.Primitives) {
         if (primitive is VisualGenealogyGraphArc) {
-          var arc = primitive as VisualGenealogyGraphArc;
-          var sourceData = arc.Source.Data.SymbolicExpressionTree;
-          var targetData = arc.Target.Data.SymbolicExpressionTree;
-          primitive.Pen.Brush = sourceData != targetData ? new SolidBrush(Color.Transparent) : new SolidBrush(Color.LightGray);
+          primitive.Pen.Brush = new SolidBrush(Color.Transparent);
         } else {
           primitive.Brush = null;
@@ -299 +242 @@
       }
     }
-
-    public void HighlightNodes(IEnumerable<SymbolicExpressionTreeGenealogyGraphNode> nodes) {
+    public void HighlightNodes(IEnumerable<IGenealogyGraphNode> nodes) {
       Chart.UpdateEnabled = false;
-      ClearAllNodes();
+      ClearPrimitives();
       foreach (var node in nodes) {
-        GetVisualGenealogyGraphNode(node).Brush = new SolidBrush(node.GetColor());
-      }
-      Chart.UpdateEnabled = true;
-      Chart.EnforceUpdate();
-    }
-
-    // TODO: optimize and reduce complexity of this method
-    public void HighlightNodes(IEnumerable<ISymbolicExpressionTree> trees) {
-      foreach (var tree in trees) {
-        var graphNodes = graph.GetGraphNodes(tree);
-        foreach (var graphNode in graphNodes) {
-          GetVisualGenealogyGraphNode(graphNode).Brush = new SolidBrush(graphNode.GetColor());
-        }
-      }
-    }
-
-    public void HighlightArcs(IEnumerable<IEdge> arcs, Color color) {
-      foreach (var a in arcs) {
-        var arc = GetVisualGenealogyGraphArc(a.Source, a.Target);
-        if (arc != null) {
-          var source = arc.Source.Data;
-          var target = arc.Target.Data;
-          var start = new Point((int)arc.Start.X, (int)arc.Start.Y);
-          var end = new Point((int)arc.End.X, (int)arc.End.Y);
-          arc.Pen.Brush = new LinearGradientBrush(start, end, source.GetColor(), target.GetColor());
-        }
-      }
-    }
-
-    public void HighlightNode(SymbolicExpressionTreeGenealogyGraphNode graphNode, Color color) {
-      GetVisualGenealogyGraphNode(graphNode).Brush = new SolidBrush(color);
-    }
-
+        GetMappedNode(node).Brush = new SolidBrush(node.GetColor());
+      }
+      Chart.UpdateEnabled = true;
+      Chart.EnforceUpdate();
+    }
     public void HighlightAll() {
       Chart.UpdateEnabled = false;
-      foreach (var visualNode in visualNodeMap.Values) {
+      foreach (var visualNode in nodeMap.Values) {
         visualNode.Brush = new SolidBrush(visualNode.Data.GetColor());
       }
-      foreach (var arc in visualArcMap.Values) {
+      foreach (var arc in arcMap.Values) {
         var source = arc.Source.Data;
         var target = arc.Target.Data;
@@ -352 +266 @@
       Chart.EnforceUpdate();
     }
-
-    public void HighlightInDegree() {
-      Chart.UpdateEnabled = false;
-      ClearAllNodes();
-      double max = Graph.Nodes.Max(x => x.InEdges == null ? 0 : x.InEdges.Count);
-      foreach (var graphNode in Graph.Nodes) {
-        var visualNode = GetVisualGenealogyGraphNode(graphNode);
-        double deg = graphNode.InEdges == null ? 0 : graphNode.InEdges.Count;
-        int index = (int)(deg / max * ColorGradient.Colors.Count);
-        if (index == ColorGradient.Colors.Count) --index;
-        var color = ColorGradient.Colors[index];
-        visualNode.Brush = new SolidBrush(color);
-      }
-      Chart.UpdateEnabled = true;
-      Chart.EnforceUpdate();
-    }
-
-    public void HighlightOutDegree() {
-      Chart.UpdateEnabled = false;
-      ClearAllNodes();
-      var graphNodes = Graph.Nodes;
-      double max = graphNodes.Max(x => x.OutEdges == null ? 0 : x.OutEdges.Count);
-      foreach (var graphNode in graphNodes) {
-        var visualNode = GetVisualGenealogyGraphNode(graphNode);
-        double deg = graphNode.OutEdges == null ? 0 : graphNode.OutEdges.Count;
-        int index = (int)(deg / max * ColorGradient.Colors.Count);
-        if (index == ColorGradient.Colors.Count) --index;
-        var color = ColorGradient.Colors[index];
-        visualNode.Brush = new SolidBrush(color);
-      }
-      Chart.UpdateEnabled = true;
-      Chart.EnforceUpdate();
-    }
   }
 
   internal static class Util {
-    public static Color GetColor(this SymbolicExpressionTreeGenealogyGraphNode node) {
+    public static Color GetColor(this IGenealogyGraphNode node) {
       var colorIndex = (int)(node.Quality * ColorGradient.Colors.Count);
       if (colorIndex >= ColorGradient.Colors.Count) --colorIndex;

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphView.Designer.cs

@@ -28 +28 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      this.splitContainer = new System.Windows.Forms.SplitContainer();
-      this.symbolicExpressionTreeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
       this.topControlBox = new System.Windows.Forms.Panel();
       this.graphControlsGroupBox = new System.Windows.Forms.GroupBox();
@@ -35 +33 @@
       this.highlightAllButton = new System.Windows.Forms.Button();
       this.simpleLineagesCheckBox = new System.Windows.Forms.CheckBox();
-      this.groupBox1 = new System.Windows.Forms.GroupBox();
-      this.matchConstantsCheckBox = new System.Windows.Forms.CheckBox();
-      this.matchVariableWeightsCheckBox = new System.Windows.Forms.CheckBox();
-      this.matchVariableNamesCheckBox = new System.Windows.Forms.CheckBox();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.genealogyGraphChart = new HeuristicLab.EvolutionaryTracking.Views.GenealogyGraphChart();
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
-      this.splitContainer.Panel1.SuspendLayout();
-      this.splitContainer.Panel2.SuspendLayout();
-      this.splitContainer.SuspendLayout();
       this.topControlBox.SuspendLayout();
       this.graphControlsGroupBox.SuspendLayout();
-      this.groupBox1.SuspendLayout();
       this.SuspendLayout();
-      // 
-      // splitContainer
-      // 
-      this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.splitContainer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.splitContainer.Location = new System.Drawing.Point(3, 53);
-      this.splitContainer.Name = "splitContainer";
-      // 
-      // splitContainer.Panel1
-      // 
-      this.splitContainer.Panel1.Controls.Add(this.genealogyGraphChart);
-      this.splitContainer.Panel1MinSize = 50;
-      // 
-      // splitContainer.Panel2
-      // 
-      this.splitContainer.Panel2.Controls.Add(this.symbolicExpressionTreeChart);
-      this.splitContainer.Panel2MinSize = 50;
-      this.splitContainer.Size = new System.Drawing.Size(1066, 722);
-      this.splitContainer.SplitterDistance = 488;
-      this.splitContainer.TabIndex = 7;
-      // 
-      // symbolicExpressionTreeChart
-      // 
-      this.symbolicExpressionTreeChart.BackgroundColor = System.Drawing.Color.White;
-      this.symbolicExpressionTreeChart.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.symbolicExpressionTreeChart.LineColor = System.Drawing.Color.Black;
-      this.symbolicExpressionTreeChart.Location = new System.Drawing.Point(0, 0);
-      this.symbolicExpressionTreeChart.Name = "symbolicExpressionTreeChart";
-      this.symbolicExpressionTreeChart.Size = new System.Drawing.Size(572, 720);
-      this.symbolicExpressionTreeChart.Spacing = 5;
-      this.symbolicExpressionTreeChart.SuspendRepaint = false;
-      this.symbolicExpressionTreeChart.TabIndex = 2;
-      this.symbolicExpressionTreeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
-      this.symbolicExpressionTreeChart.Tree = null;
       // 
       // topControlBox
@@ -141 +94 @@
       this.simpleLineagesCheckBox.CheckedChanged += new System.EventHandler(this.simpleLineagesCheckBox_CheckedChanged);
       // 
-      // groupBox1
-      // 
-      this.groupBox1.Controls.Add(this.matchConstantsCheckBox);
-      this.groupBox1.Controls.Add(this.matchVariableWeightsCheckBox);
-      this.groupBox1.Controls.Add(this.matchVariableNamesCheckBox);
-      this.groupBox1.Location = new System.Drawing.Point(104, 1);
-      this.groupBox1.Name = "groupBox1";
-      this.groupBox1.Size = new System.Drawing.Size(325, 44);
-      this.groupBox1.TabIndex = 12;
-      this.groupBox1.TabStop = false;
-      this.groupBox1.Text = "Matching constraints";
-      // 
-      // matchConstantsCheckBox
-      // 
-      this.matchConstantsCheckBox.AutoSize = true;
-      this.matchConstantsCheckBox.Checked = true;
-      this.matchConstantsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.matchConstantsCheckBox.Location = new System.Drawing.Point(6, 19);
-      this.matchConstantsCheckBox.Name = "matchConstantsCheckBox";
-      this.matchConstantsCheckBox.Size = new System.Drawing.Size(102, 17);
-      this.matchConstantsCheckBox.TabIndex = 5;
-      this.matchConstantsCheckBox.Text = "Constant values";
-      this.matchConstantsCheckBox.UseVisualStyleBackColor = true;
-      this.matchConstantsCheckBox.CheckedChanged += new System.EventHandler(this.matchConstantsCheckBox_CheckedChanged);
-      // 
-      // matchVariableWeightsCheckBox
-      // 
-      this.matchVariableWeightsCheckBox.AutoSize = true;
-      this.matchVariableWeightsCheckBox.Checked = true;
-      this.matchVariableWeightsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.matchVariableWeightsCheckBox.Location = new System.Drawing.Point(114, 19);
-      this.matchVariableWeightsCheckBox.Name = "matchVariableWeightsCheckBox";
-      this.matchVariableWeightsCheckBox.Size = new System.Drawing.Size(103, 17);
-      this.matchVariableWeightsCheckBox.TabIndex = 6;
-      this.matchVariableWeightsCheckBox.Text = "Variable weights";
-      this.matchVariableWeightsCheckBox.UseVisualStyleBackColor = true;
-      this.matchVariableWeightsCheckBox.CheckedChanged += new System.EventHandler(this.matchVariableWeightsCheckBox_CheckedChanged);
-      // 
-      // matchVariableNamesCheckBox
-      // 
-      this.matchVariableNamesCheckBox.AutoSize = true;
-      this.matchVariableNamesCheckBox.Checked = true;
-      this.matchVariableNamesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.matchVariableNamesCheckBox.Location = new System.Drawing.Point(223, 19);
-      this.matchVariableNamesCheckBox.Name = "matchVariableNamesCheckBox";
-      this.matchVariableNamesCheckBox.Size = new System.Drawing.Size(98, 17);
-      this.matchVariableNamesCheckBox.TabIndex = 7;
-      this.matchVariableNamesCheckBox.Text = "Variable names";
-      this.matchVariableNamesCheckBox.UseVisualStyleBackColor = true;
-      this.matchVariableNamesCheckBox.CheckedChanged += new System.EventHandler(this.matchVariableNamesCheckBox_CheckedChanged);
-      // 
       // genealogyGraphChart
       // 
+      this.genealogyGraphChart.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.genealogyGraphChart.BackColor = System.Drawing.SystemColors.Control;
-      this.genealogyGraphChart.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.genealogyGraphChart.Location = new System.Drawing.Point(0, 0);
+      this.genealogyGraphChart.Chart = null;
+      this.genealogyGraphChart.GenealogyGraph = null;
+      this.genealogyGraphChart.Location = new System.Drawing.Point(3, 51);
       this.genealogyGraphChart.LockGenealogy = false;
       this.genealogyGraphChart.Name = "genealogyGraphChart";
       this.genealogyGraphChart.ScaleOnResize = true;
       this.genealogyGraphChart.SimpleLineages = false;
-      this.genealogyGraphChart.Size = new System.Drawing.Size(486, 720);
-      this.genealogyGraphChart.TabIndex = 2;
+      this.genealogyGraphChart.Size = new System.Drawing.Size(1066, 724);
+      this.genealogyGraphChart.TabIndex = 7;
       // 
       // GenealogyGraphView
@@ -208 +113 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.groupBox1);
-      this.Controls.Add(this.splitContainer);
+      this.Controls.Add(this.genealogyGraphChart);
       this.Controls.Add(this.topControlBox);
       this.Name = "GenealogyGraphView";
       this.Size = new System.Drawing.Size(1072, 778);
-      this.splitContainer.Panel1.ResumeLayout(false);
-      this.splitContainer.Panel2.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
-      this.splitContainer.ResumeLayout(false);
       this.topControlBox.ResumeLayout(false);
       this.graphControlsGroupBox.ResumeLayout(false);
-      this.groupBox1.ResumeLayout(false);
-      this.groupBox1.PerformLayout();
       this.ResumeLayout(false);
 
@@ -227 +125 @@
     #endregion
 
-    private System.Windows.Forms.SplitContainer splitContainer;
-    private SymbolicExpressionTreeChart symbolicExpressionTreeChart;
-
-    private GenealogyGraphChart genealogyGraphChart;
     private System.Windows.Forms.ToolTip toolTip;
     private System.Windows.Forms.Panel topControlBox;
-    private System.Windows.Forms.GroupBox groupBox1;
-    private System.Windows.Forms.CheckBox matchConstantsCheckBox;
-    private System.Windows.Forms.CheckBox matchVariableWeightsCheckBox;
-    private System.Windows.Forms.CheckBox matchVariableNamesCheckBox;
     private System.Windows.Forms.GroupBox graphControlsGroupBox;
     private System.Windows.Forms.Button highlightAllButton;
     private System.Windows.Forms.CheckBox simpleLineagesCheckBox;
     private System.Windows.Forms.CheckBox lockGenealogyCheckBox;
+    private GenealogyGraphChart genealogyGraphChart;
 
   }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphView.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Core.Views;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
 using HeuristicLab.MainForm;
-using HeuristicLab.Problems.DataAnalysis.Symbolic;
 
 namespace HeuristicLab.EvolutionaryTracking.Views {
-  [View("SymbolicExpressionTreeGenealogyGraph")]
-  [Content(typeof(SymbolicExpressionTreeGenealogyGraph), IsDefaultView = true)]
+  [View("GenealogyGraph")]
+  [Content(typeof(GenealogyGraph), IsDefaultView = true)]
   public sealed partial class GenealogyGraphView : ItemView {
-    private VisualSymbolicExpressionTreeNode selectedVisualSymbExprTreeNode;
-    private SymbolicExpressionTreeNodeSimilarityComparer comparer;
-    private Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> clonedNodes;
-
-    public new SymbolicExpressionTreeGenealogyGraph Content {
-      get { return (SymbolicExpressionTreeGenealogyGraph)base.Content; }
+    public new GenealogyGraph Content {
+      get { return (GenealogyGraph)base.Content; }
       set { base.Content = value; }
     }
@@ -51 +42 @@
       this.simpleLineagesCheckBox.Image = Common.Resources.VSImageLibrary.ArrowDown;
       this.lockGenealogyCheckBox.Image = Common.Resources.VSImageLibrary.ProtectForm;
-
-      comparer = new SymbolicExpressionTreeNodeSimilarityComparer {
-        MatchConstantValues = true,
-        MatchVariableWeights = true,
-        MatchVariableNames = true
-      };
     }
 
     protected override void DeregisterContentEvents() {
       // TODO: Deregister your event handlers here
-      genealogyGraphChart.GenealogyGraphNodeClicked -= graphChart_GenealogyGraphNodeClicked;
-      symbolicExpressionTreeChart.SymbolicExpressionTreeNodeClicked -= treeChart_SymbolicExpressionTreeNodeClicked;
-      symbolicExpressionTreeChart.SymbolicExpressionTreeNodeDoubleClicked -= treeChart_SymbolicExpressionTreeNodeDoubleClicked;
-      Content.GraphUpdated -= genealogyGraphUpdated;
+      Content.GraphUpdated -= GenealogyGraphUpdated;
       base.DeregisterContentEvents();
     }
@@ -71 +53 @@
       base.RegisterContentEvents();
       // TODO: Register your event handlers here
-      genealogyGraphChart.GenealogyGraphNodeClicked += graphChart_GenealogyGraphNodeClicked;
-      symbolicExpressionTreeChart.SymbolicExpressionTreeNodeClicked += treeChart_SymbolicExpressionTreeNodeClicked;
-      symbolicExpressionTreeChart.SymbolicExpressionTreeNodeDoubleClicked += treeChart_SymbolicExpressionTreeNodeDoubleClicked;
-      Content.GraphUpdated += genealogyGraphUpdated;
+      Content.GraphUpdated += GenealogyGraphUpdated;
     }
 
@@ -81 +60 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content == null)
-        genealogyGraphChart.Graph = null;
-      else {
-        genealogyGraphChart.Graph = Content;
-        //        var best = Content.Nodes.OrderByDescending(x => x.Quality).First();
-        //        symbolicExpressionTreeChart.Tree = best.SymbolicExpressionTree;
-      }
+      genealogyGraphChart.GenealogyGraph = Content ?? null;
     }
-
     private void Content_GraphChanged(object sender, EventArgs e) {
     }
-
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
@@ -100 +71 @@
 
     #region Event Handlers (child controls)
-
-    // TODO: Put event handlers of child controls here.
-    private void graphChart_GenealogyGraphNodeClicked(object sender, MouseEventArgs e) {
-      // the type hierarchy goes like this: VisualGenealogyGraphNode --> GenealogyGraphNode --> SymbolicExpressionTree
-      var visualGenealogyGraphNode = (VisualGenealogyGraphNode)sender;
-      var genealogyGraphNode = visualGenealogyGraphNode.Data;
-      symbolicExpressionTreeChart.Tree = genealogyGraphNode.SymbolicExpressionTree;
-
-      if (genealogyGraphNode.InEdges == null) return;
-      var arc = genealogyGraphNode.InEdges.Last(x => x.Source != x.Target);
-      if (arc == null || arc.Data == null) return;
-      var fragment = (IFragment)arc.Data;
-      if (fragment.Root == null) return;
-      foreach (var node in fragment.Root.IterateNodesBreadth()) {
-        var visualSymbExprTreeNode = symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(node);
-        visualSymbExprTreeNode.LineColor = Color.OrangeRed;
-      }
-      symbolicExpressionTreeChart.Repaint();
+    private void GenealogyGraphUpdated(object sender, EventArgs args) {
+      genealogyGraphChart.GenealogyGraph = Content;
     }
-
-    private void genealogyGraphUpdated(object sender, EventArgs args) {
-      genealogyGraphChart.Graph = Content;
-    }
-
-    private void treeChart_SymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) {
-      genealogyGraphChart.Chart.UpdateEnabled = false;
-      switch (e.Button) {
-        case MouseButtons.Left: {
-            selectedVisualSymbExprTreeNode = (VisualSymbolicExpressionTreeNode)sender;
-            if (selectedVisualSymbExprTreeNode == null) return;
-            ISymbolicExpressionTreeNode selectedSubtree = selectedVisualSymbExprTreeNode.SymbolicExpressionTreeNode;
-            var clonedSubtree = (ISymbolicExpressionTreeNode)selectedSubtree.Clone();
-            // map original nodes to cloned nodes
-            clonedNodes = selectedSubtree.IterateNodesPrefix()
-                                         .Zip(clonedSubtree.IterateNodesPrefix(), (original, clone) => new { original, clone })
-                                         .ToDictionary(p => p.original, p => p.clone);
-
-            foreach (var node in symbolicExpressionTreeChart.Tree.IterateNodesPrefix()) {
-              symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(node).FillColor = Color.Transparent;
-            }
-            foreach (var node in selectedSubtree.IterateNodesPrefix()) {
-              symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(node).FillColor = Color.LightBlue;
-            }
-            break;
-          }
-        case MouseButtons.Middle: {
-            var visualNode = (VisualSymbolicExpressionTreeNode)sender;
-            if (selectedVisualSymbExprTreeNode == null || selectedVisualSymbExprTreeNode == visualNode) return;
-            var selectedNode = visualNode.SymbolicExpressionTreeNode;
-            if (clonedNodes.ContainsKey(selectedNode)) {
-              var selectedClone = clonedNodes[selectedNode];
-              var parent = selectedClone.Parent;
-              if (parent == null) break;
-              int index = parent.IndexOfSubtree(selectedClone);
-              if (index == -1) break;
-              parent.RemoveSubtree(parent.IndexOfSubtree(selectedClone));
-              foreach (var node in selectedNode.IterateNodesPrefix()) {
-                symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(node).FillColor = Color.Transparent;
-              }
-            }
-            break;
-          }
-      }
-      if (selectedVisualSymbExprTreeNode == null || clonedNodes == null) return;
-      // update visual graph nodes that contain matching trees
-      MatchNodesAndRepaint();
-      // refresh the tree chart
-      symbolicExpressionTreeChart.Repaint();
-    }
-
     void MatchNodesAndRepaint() {
       genealogyGraphChart.Chart.UpdateEnabled = false;
-      genealogyGraphChart.ClearAllNodes(); // clear node colors
-      var fragment = new Fragment { Root = clonedNodes[selectedVisualSymbExprTreeNode.SymbolicExpressionTreeNode] };
-      var fragmentLength = fragment.Length;
-      // highlight nodes
-      genealogyGraphChart.HighlightNodes(from node in genealogyGraphChart.Graph.Nodes
-                                         let tree = node.SymbolicExpressionTree
-                                         where tree.Length >= fragmentLength
-                                         where tree.Root.ContainsFragment(fragment, comparer)
-                                         select tree);
-      // highlight edges that contain a matching fragment
-      var fragmentSimilarityComparer = new SymbolicExpressionTreeFragmentSimilarityComparer {
-        SimilarityComparer = comparer
-      };
-      var matchingEdges = genealogyGraphChart.Graph.Nodes.Where(n => n.InEdges != null)
-                           .SelectMany(n => n.InEdges).Where(edge => edge.Data != null && ((IFragment)edge.Data).Root != null)
-                           .Where(edge => fragmentSimilarityComparer.Equals(fragment, (IFragment)edge.Data));
-      genealogyGraphChart.HighlightArcs(matchingEdges, Color.DodgerBlue);
-
+      genealogyGraphChart.ClearPrimitives(); // clear node colors
 
       genealogyGraphChart.Chart.UpdateEnabled = true;
@@ -198 +85 @@
     }
     #endregion
-
-    private void matchConstantsCheckBox_CheckedChanged(object sender, EventArgs e) {
-      comparer.MatchConstantValues = matchConstantsCheckBox.Checked;
-      if (selectedVisualSymbExprTreeNode != null)
-        MatchNodesAndRepaint();
-    }
-
-    private void matchVariableWeightsCheckBox_CheckedChanged(object sender, EventArgs e) {
-      comparer.MatchVariableWeights = matchVariableWeightsCheckBox.Checked;
-      if (selectedVisualSymbExprTreeNode != null)
-        MatchNodesAndRepaint();
-    }
-
-    private void matchVariableNamesCheckBox_CheckedChanged(object sender, EventArgs e) {
-      comparer.MatchVariableNames = matchVariableNamesCheckBox.Checked;
-      if (selectedVisualSymbExprTreeNode != null)
-        MatchNodesAndRepaint();
-    }
-
     private void simpleLineagesCheckBox_CheckedChanged(object sender, EventArgs e) {
       genealogyGraphChart.SimpleLineages = simpleLineagesCheckBox.Checked;
@@ -222 +90 @@
 
     private void highlightAllButton_Click(object sender, EventArgs e) {
-      symbolicExpressionTreeChart.Repaint();
-      genealogyGraphChart.HighlightAll();
     }
 
@@ -231 +97 @@
 
     private void highlightRootParentsButton_Click(object sender, EventArgs e) {
-      var nodes = genealogyGraphChart.Graph.Nodes.Where(n => n.InEdges != null && n.InEdges.Count == 2).Select(n => (SymbolicExpressionTreeGenealogyGraphNode)n.InEdges[0].Source).ToList();
+      var nodes = genealogyGraphChart.GenealogyGraph.Nodes.Where(n => n.InArcs != null && n.InArcs.Count == 2).Select(n => (GenealogyGraphNode)n.InArcs[0].Source).ToList();
       genealogyGraphChart.HighlightNodes(nodes);
     }
 
     private void highlightSecondaryParentsButton_Click(object sender, EventArgs e) {
-      var nodes = genealogyGraphChart.Graph.Nodes.Where(n => n.InEdges != null && n.InEdges.Count == 2).Select(n => (SymbolicExpressionTreeGenealogyGraphNode)n.InEdges[1].Source).ToList();
+      var nodes = genealogyGraphChart.GenealogyGraph.Nodes.Where(n => n.InArcs != null && n.InArcs.Count == 2).Select(n => (GenealogyGraphNode)n.InArcs[1].Source).ToList();
       genealogyGraphChart.HighlightNodes(nodes);
     }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/HeuristicLab.EvolutionTracking.Views-3.4.csproj

@@ -9 +9 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HeuristicLab.EvolutionaryTracking.Views</RootNamespace>
-    <AssemblyName>HeuristicLab.EvolutionaryTracking.Views-3.4</AssemblyName>
+    <RootNamespace>HeuristicLab.EvolutionTracking.Views</RootNamespace>
+    <AssemblyName>HeuristicLab.EvolutionTracking.Views-3.4</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -110 +110 @@
   <ItemGroup>
     <Compile Include="AncestryLayoutAdapter.cs" />
-    <Compile Include="ExtendedSymbolicExpressionTreeCanvas.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
     <Compile Include="FrequentFragmentsDialog.cs">
       <SubType>Form</SubType>
@@ -125 +122 @@
       <DependentUpon>GenealogyGraphChart.cs</DependentUpon>
     </Compile>
-    <Compile Include="GenealogyGraphDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GenealogyGraphDialog.designer.cs">
-      <DependentUpon>GenealogyGraphDialog.cs</DependentUpon>
-    </Compile>
     <Compile Include="GenealogyGraphView.cs">
       <SubType>UserControl</SubType>
@@ -136 +127 @@
     <Compile Include="GenealogyGraphView.Designer.cs">
       <DependentUpon>GenealogyGraphView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="LineageExplorerView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="LineageExplorerView.Designer.cs">
-      <DependentUpon>LineageExplorerView.cs</DependentUpon>
     </Compile>
     <Compile Include="Plugin.cs" />
@@ -158 +143 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.EvolutionaryTracking\3.4\HeuristicLab.EvolutionTracking-3.4.csproj">
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj">
+      <Project>{423bd94f-963a-438e-ba45-3bb3d61cd03b}</Project>
+      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
+      <Project>{06d4a186-9319-48a0-bade-a2058d462eea}</Project>
+      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.EvolutionTracking\3.4\HeuristicLab.EvolutionTracking-3.4.csproj">
       <Project>{1f75cea3-464f-4a6f-b2f0-04b9841ebc16}</Project>
       <Name>HeuristicLab.EvolutionTracking-3.4</Name>

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/Primitives/LabeledEllipse.cs

@@ -23 +23 @@
 using System.Drawing;
 using System.Linq;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Visualization;
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/Primitives/LabeledRectangle.cs

@@ -23 +23 @@
 using System.Drawing;
 using System.Linq;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Visualization;
 using Rectangle = HeuristicLab.Visualization.Rectangle;

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/VisualGenealogyGraphNode.cs

@@ -27 +27 @@
 namespace HeuristicLab.EvolutionaryTracking.Views {
   public class VisualGenealogyGraphNode : Ellipse {
-    public SymbolicExpressionTreeGenealogyGraphNode Data { get; internal set; }
+    public IGenealogyGraphNode Data { get; internal set; }
     private List<VisualGenealogyGraphArc> incomingArcs = new List<VisualGenealogyGraphArc>();
     private List<VisualGenealogyGraphArc> outgoingArcs = new List<VisualGenealogyGraphArc>();

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/HeuristicLab.EvolutionTracking-3.4.csproj

@@ -131 +131 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Analyzers\BuildingBlocks\RelevantBuildingBlocksAnalyzer.cs" />
-    <Compile Include="Analyzers\BuildingBlocks\Poly10BuildingBlocksAnalyzer.cs" />
-    <Compile Include="Analyzers\SymbolicExpressionTreePruningAnalyzer.cs" />
-    <Compile Include="Analyzers\SymbolicExpressionTreeShapeAnalyzer.cs" />
-    <Compile Include="Analyzers\SymbolicExpressionTreeEvolvabilityAnalyzer.cs" />
-    <Compile Include="Analyzers\Fragments\SymbolicExpressionTreeRelativeFragmentDepthAnalyzer.cs" />
-    <Compile Include="Analyzers\Fragments\SymbolicExpressionTreeFragmentLengthsAnalyzer.cs" />
-    <Compile Include="Analyzers\SymbolicExpressionTreeFrequentPatternsAnalyzer.cs" />
-    <Compile Include="Analyzers\Fragments\SymbolicExpressionTreeFragmentsAnalyzer.cs" />
-    <Compile Include="FPGraph.cs" />
-    <Compile Include="Interfaces\IEdge.cs" />
-    <Compile Include="LineageExplorer.cs" />
-    <Compile Include="Operators\LineageAggregator.cs" />
-    <Compile Include="Operators\SymbolicExpressionTreeFPBuilder.cs" />
-    <Compile Include="Operators\SymbolicExpressionTreeGenealogyGraphBuilder.cs" />
-    <Compile Include="Analyzers\SymbolicExpressionTreePopulationDiversityAnalyzer.cs" />
-    <Compile Include="Analyzers\SymbolicExpressionTreeRelativeLengthAnalyzer.cs" />
-    <Compile Include="GenericGraph\GenericGraph.cs" />
-    <Compile Include="GenericGraph\Arc.cs" />
-    <Compile Include="GenericGraph\Vertex.cs" />
-    <Compile Include="Interfaces\IGenericGraph.cs" />
-    <Compile Include="Interfaces\IVertex.cs" />
-    <Compile Include="Interfaces\ISymbolicExpressionTreeGenealogyGraph.cs" />
-    <Compile Include="Operators\CleanupOperator.cs" />
-    <Compile Include="Operators\SymbolicExpressionTreeSymbolGraphBuilder.cs" />
-    <Compile Include="Operators\Util.cs" />
-    <Compile Include="Plugin.cs" />
+    <Compile Include="DirectedGraph\Arc.cs" />
+    <Compile Include="DirectedGraph\DirectedGraph.cs" />
+    <Compile Include="DirectedGraph\Interfaces\IArc.cs" />
+    <Compile Include="DirectedGraph\Interfaces\IDirectedGraph.cs" />
+    <Compile Include="DirectedGraph\Interfaces\IVertex.cs" />
+    <Compile Include="DirectedGraph\Vertex.cs" />
+    <Compile Include="EvolutionTrackingOperators\EvolutionTrackingAfterCreationOperator.cs" />
+    <Compile Include="EvolutionTrackingOperators\EvolutionTrackingAfterCrossoverOperator.cs" />
+    <Compile Include="EvolutionTrackingOperators\EvolutionTrackingOperator.cs" />
+    <Compile Include="FPGraph.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="GenealogyGraph\GenealogyGraph.cs" />
+    <Compile Include="GenealogyGraph\GenealogyGraphArc.cs" />
+    <Compile Include="GenealogyGraph\GenealogyGraphNode.cs" />
+    <Compile Include="GenealogyGraph\Interfaces\IGenealogyGraph.cs" />
+    <Compile Include="GenealogyGraph\Interfaces\IGenealogyGraphArc.cs" />
+    <Compile Include="GenealogyGraph\Interfaces\IGenealogyGraphNode.cs" />
+    <Compile Include="Plugin.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SymbolGraph.cs" />
-    <Compile Include="SymbolicExpressionTreeGenealogyGraph\SymbolicExpressionTreeGenealogyGraph.cs" />
-    <Compile Include="SymbolicExpressionTreeGenealogyGraph\SymbolicExpressionTreeGenealogyGraphNode.cs" />
+    <Compile Include="SymbolGraph.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
-    <WCFMetadata Include="Service References\" />
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
+      <Project>{06d4a186-9319-48a0-bade-a2058d462eea}</Project>
+      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/HeuristicLab.EvolutionTracking-3.4.csproj.user

@@ -2 +2 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
 </Project>

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

@@ -41 +41 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -50 +50 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -58 +58 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -66 +66 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -76 +76 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -84 +84 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -93 +93 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
+    <Reference Include="ALGLIB-3.7.0">
+      <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Analysis-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Collections-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Data-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Parameters-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.Instances-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Random-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -125 +186 @@
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="SlidingWindow\GenerationalSlidingWindowAnalyzer.cs" />
+    <Compile Include="SlidingWindow\OffspringSelectionSlidingWindowAnalyzer.cs" />
+    <Compile Include="SlidingWindow\SlidingWindowAnalyzer.cs" />
+    <Compile Include="SlidingWindow\SlidingWindowData.cs" />
+    <Compile Include="SlidingWindow\SlidingWindowQualitiesAnalyzer.cs" />
+    <Compile Include="SlidingWindow\SlidingWindowVisualizer.cs" />
+    <Compile Include="SymbolicDataAnalysisSolutionPruningOptimizer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisVariableFrequencyAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisAlleleFrequencyAnalyzer.cs" />
@@ -253 +321 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
-      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
-      <Name>HeuristicLab.Analysis-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
-      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
-      <Name>HeuristicLab.Collections-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
-      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
-      <Name>HeuristicLab.Common.Resources-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
-      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
-      <Name>HeuristicLab.Common-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
-      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
-      <Name>HeuristicLab.Core-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
-      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
-      <Name>HeuristicLab.Data-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
       <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
@@ -288 +326 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
-      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
-      <Name>HeuristicLab.Operators-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
-      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
-      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
-      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
-      <Name>HeuristicLab.Optimization-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
-      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
-      <Name>HeuristicLab.Parameters-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
-      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
-      <Name>HeuristicLab.Persistence-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
-      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
-      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
-      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
-      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
-      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
-      <Name>HeuristicLab.Problems.Instances-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
-      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
-      <Name>HeuristicLab.Random-3.3</Name>
+    <ProjectReference Include="..\..\HeuristicLab.EvolutionTracking\3.4\HeuristicLab.EvolutionTracking-3.4.csproj">
+      <Project>{1f75cea3-464f-4a6f-b2f0-04b9841ebc16}</Project>
+      <Name>HeuristicLab.EvolutionTracking-3.4</Name>
       <Private>False</Private>
     </ProjectReference>

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Tracking.sln

@@ -13 +13 @@
   EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.EvolutionTracking-3.4", "HeuristicLab.EvolutionaryTracking\3.4\HeuristicLab.EvolutionTracking-3.4.csproj", "{1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4", "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj", "{06D4A186-9319-48A0-BADE-A2058D462EEA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.EvolutionTracking.Views-3.4", "HeuristicLab.EvolutionaryTracking.Views\3.4\HeuristicLab.EvolutionTracking.Views-3.4.csproj", "{318DFE8C-CA23-4F1B-A4AC-62B425060241}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4", "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj", "{423BD94F-963A-438E-BA45-3BB3D61CD03B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.EvolutionTracking-3.4", "HeuristicLab.EvolutionTracking\3.4\HeuristicLab.EvolutionTracking-3.4.csproj", "{1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.EvolutionTracking.Views-3.4", "HeuristicLab.EvolutionTracking.Views\3.4\HeuristicLab.EvolutionTracking.Views-3.4.csproj", "{318DFE8C-CA23-4F1B-A4AC-62B425060241}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Symbolic-3.4", "HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj", "{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}"
 EndProject
 Global
@@ -29 +35 @@
   EndGlobalSection
   GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|Mixed Platforms.Build.0 = Debug|x86
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|x64.ActiveCfg = Debug|x64
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|x64.Build.0 = Debug|x64
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|x86.ActiveCfg = Debug|x86
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|x86.Build.0 = Debug|x86
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|Any CPU.Build.0 = Release|Any CPU
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|Mixed Platforms.ActiveCfg = Release|x86
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|Mixed Platforms.Build.0 = Release|x86
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|x64.ActiveCfg = Release|x64
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|x64.Build.0 = Release|x64
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|x86.ActiveCfg = Release|x86
+    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|x86.Build.0 = Release|x86
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Debug|Mixed Platforms.Build.0 = Debug|x86
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Debug|x64.ActiveCfg = Debug|x64
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Debug|x64.Build.0 = Debug|x64
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Debug|x86.ActiveCfg = Debug|x86
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Debug|x86.Build.0 = Debug|x86
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Release|Any CPU.Build.0 = Release|Any CPU
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Release|Mixed Platforms.ActiveCfg = Release|x86
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Release|Mixed Platforms.Build.0 = Release|x86
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Release|x64.ActiveCfg = Release|x64
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Release|x64.Build.0 = Release|x64
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Release|x86.ActiveCfg = Release|x86
+    {423BD94F-963A-438E-BA45-3BB3D61CD03B}.Release|x86.Build.0 = Release|x86
     {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|Any CPU.Build.0 = Debug|Any CPU
     {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|x64.ActiveCfg = Debug|x64
+    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|x64.Build.0 = Debug|x64
     {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|x86.ActiveCfg = Debug|Any CPU
     {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -46 +85 @@
     {318DFE8C-CA23-4F1B-A4AC-62B425060241}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     {318DFE8C-CA23-4F1B-A4AC-62B425060241}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-    {318DFE8C-CA23-4F1B-A4AC-62B425060241}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {318DFE8C-CA23-4F1B-A4AC-62B425060241}.Debug|x64.ActiveCfg = Debug|x64
+    {318DFE8C-CA23-4F1B-A4AC-62B425060241}.Debug|x64.Build.0 = Debug|x64
     {318DFE8C-CA23-4F1B-A4AC-62B425060241}.Debug|x86.ActiveCfg = Debug|Any CPU
     {318DFE8C-CA23-4F1B-A4AC-62B425060241}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55 +95 @@
     {318DFE8C-CA23-4F1B-A4AC-62B425060241}.Release|x64.Build.0 = Release|x64
     {318DFE8C-CA23-4F1B-A4AC-62B425060241}.Release|x86.ActiveCfg = Release|Any CPU
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Debug|Mixed Platforms.Build.0 = Debug|x86
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Debug|x64.ActiveCfg = Debug|x64
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Debug|x64.Build.0 = Debug|x64
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Debug|x86.ActiveCfg = Debug|x86
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Debug|x86.Build.0 = Debug|x86
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Release|Any CPU.Build.0 = Release|Any CPU
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Release|Mixed Platforms.ActiveCfg = Release|x86
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Release|Mixed Platforms.Build.0 = Release|x86
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Release|x64.ActiveCfg = Release|x64
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Release|x64.Build.0 = Release|x64
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Release|x86.ActiveCfg = Release|x86
+    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution