Changeset 10300

Timestamp:

01/07/14 21:44:36 (10 years ago)

Author:

bburlacu

Message:

#1772: Cleaned up the design of the generic genealogy analyzer and related classes, created generic genealogy graph view. Added instrumentation code to TravelingSalesmapProblem.cs allowing genealogy tracking. Merged trunk changes (instrumentation for multi operators).

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) (1 prop)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.Designer.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs (modified) (3 diffs)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphView.Designer.cs (modified) (3 diffs)
• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphView.cs (modified) (2 diffs)
• HeuristicLab.EvolutionTracking.Views/3.4/HeuristicLab.EvolutionTracking.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.EvolutionTracking.Views/3.4/Plugin.cs (modified) (2 diffs)
• HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs (modified) (10 diffs)
• HeuristicLab.EvolutionTracking/3.4/DirectedGraph/DirectedGraph.cs (modified) (4 diffs)
• HeuristicLab.EvolutionTracking/3.4/DirectedGraph/Interfaces/IDirectedGraph.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/DirectedGraph/Interfaces/IVertex.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/DirectedGraph/Vertex.cs (modified) (4 diffs)
• HeuristicLab.EvolutionTracking/3.4/FPGraph.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs (modified) (3 diffs)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphNode.cs (modified) (2 diffs)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/Interfaces/IGenealogyGraph.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/Interfaces/IGenealogyGraphNode.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/HeuristicLab.EvolutionTracking-3.4.csproj.user (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/Operators/AfterCrossoverOperator.cs (modified) (2 diffs)
• HeuristicLab.EvolutionTracking/3.4/Operators/AfterManipulatorOperator.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/Operators/AfterSolutionCreatorOperator.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs (modified) (3 diffs)
• HeuristicLab.EvolutionTracking/3.4/Operators/EvolutionTrackingOperator.cs (modified) (3 diffs)
• HeuristicLab.EvolutionTracking/3.4/Plugin.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/SymbolGraph.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisGenealogyAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Creators/MultiSymbolicDataAnalysisExpressionCreator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisSingleObjectiveProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.TravelingSalesman (copied) (copied from trunk/sources/HeuristicLab.Problems.TravelingSalesman) (1 prop)
• HeuristicLab.Problems.TravelingSalesman.Views (copied) (copied from trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views) (1 prop)
• HeuristicLab.Problems.TravelingSalesman.Views/3.3/HeuristicLab.Problems.TravelingSalesman.Views-3.3.csproj (modified) (10 diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPGenealogyAnalyzer.cs (added)
• HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj (modified) (12 diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (5 diffs)
• HeuristicLab.Tracking.sln (modified) (2 diffs)

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

@@ -1 @@
-using HeuristicLab.Core;
-
+
 namespace HeuristicLab.EvolutionTracking.Views {
-  partial class GenealogyGraphChart<TGraph, TVertex, TContent>
-    where TGraph : class, IGenealogyGraph<TVertex, TContent>
-    where TVertex : class, IGenealogyGraphNode<TContent>, new()
-    where TContent : class, IItem {
+  partial class GenealogyGraphChart {
     /// <summary> 
     /// Required designer variable.

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

@@ -6 +6 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
-using HeuristicLab.Core;
 using HeuristicLab.Visualization;
 
 namespace HeuristicLab.EvolutionTracking.Views {
-  public partial class GenealogyGraphChart<TGraph, TVertex, TContent> : ChartControl
-    where TGraph : class, IGenealogyGraph<TVertex, TContent>
-    where TVertex : class, IGenealogyGraphNode<TContent>, new()
-    where TContent : class,IItem {
-    private TGraph genealogyGraph;
+  public partial class GenealogyGraphChart : ChartControl {
+    private IGenealogyGraph genealogyGraph;
 
     private const double XIncrement = 30;
@@ -20 +16 @@
     private const double Diameter = 20;
 
-    public TGraph GenealogyGraph {
+    public IGenealogyGraph GenealogyGraph {
       get { return genealogyGraph; }
       set {
@@ -109 +105 @@
 
       // add arcs
-      foreach (var node in GenealogyGraph.Nodes) {
+      foreach (var node in GenealogyGraph.Nodes.Cast<IGenealogyGraphNode>()) {
         if (node.InArcs == null) continue;
         var visualNode = nodeMap[node];

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

@@ -1 @@
-
+using HeuristicLab.Visualization;
 
 namespace HeuristicLab.EvolutionTracking.Views {
@@ -26 +26 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
-      this.topControlBox = new System.Windows.Forms.Panel();
-      this.graphControlsGroupBox = new System.Windows.Forms.GroupBox();
-      this.lockGenealogyCheckBox = new System.Windows.Forms.CheckBox();
-      this.highlightAllButton = new System.Windows.Forms.Button();
-      this.simpleLineagesCheckBox = new System.Windows.Forms.CheckBox();
-      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.genealogyGraphChart = new HeuristicLab.EvolutionTracking.Views.GenealogyGraphChart();
-      this.topControlBox.SuspendLayout();
-      this.graphControlsGroupBox.SuspendLayout();
       this.SuspendLayout();
-      // 
-      // topControlBox
-      // 
-      this.topControlBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.topControlBox.Controls.Add(this.graphControlsGroupBox);
-      this.topControlBox.Location = new System.Drawing.Point(3, 3);
-      this.topControlBox.Name = "topControlBox";
-      this.topControlBox.Size = new System.Drawing.Size(1066, 44);
-      this.topControlBox.TabIndex = 6;
-      // 
-      // graphControlsGroupBox
-      // 
-      this.graphControlsGroupBox.Controls.Add(this.lockGenealogyCheckBox);
-      this.graphControlsGroupBox.Controls.Add(this.highlightAllButton);
-      this.graphControlsGroupBox.Controls.Add(this.simpleLineagesCheckBox);
-      this.graphControlsGroupBox.Location = new System.Drawing.Point(1, -2);
-      this.graphControlsGroupBox.Name = "graphControlsGroupBox";
-      this.graphControlsGroupBox.Size = new System.Drawing.Size(98, 44);
-      this.graphControlsGroupBox.TabIndex = 11;
-      this.graphControlsGroupBox.TabStop = false;
-      this.graphControlsGroupBox.Text = "Graph controls";
-      // 
-      // lockGenealogyCheckBox
-      // 
-      this.lockGenealogyCheckBox.Appearance = System.Windows.Forms.Appearance.Button;
-      this.lockGenealogyCheckBox.Location = new System.Drawing.Point(66, 14);
-      this.lockGenealogyCheckBox.Name = "lockGenealogyCheckBox";
-      this.lockGenealogyCheckBox.Size = new System.Drawing.Size(24, 24);
-      this.lockGenealogyCheckBox.TabIndex = 17;
-      this.toolTip.SetToolTip(this.lockGenealogyCheckBox, "Lock genealogy");
-      this.lockGenealogyCheckBox.UseVisualStyleBackColor = true;
-      this.lockGenealogyCheckBox.CheckedChanged += new System.EventHandler(this.lockGenealogyCheckBox_CheckedChanged);
-      // 
-      // highlightAllButton
-      // 
-      this.highlightAllButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-      this.highlightAllButton.Location = new System.Drawing.Point(6, 14);
-      this.highlightAllButton.Name = "highlightAllButton";
-      this.highlightAllButton.Size = new System.Drawing.Size(24, 24);
-      this.highlightAllButton.TabIndex = 13;
-      this.toolTip.SetToolTip(this.highlightAllButton, "Fitness gradient");
-      this.highlightAllButton.UseVisualStyleBackColor = true;
-      this.highlightAllButton.Click += new System.EventHandler(this.highlightAllButton_Click);
-      // 
-      // simpleLineagesCheckBox
-      // 
-      this.simpleLineagesCheckBox.Appearance = System.Windows.Forms.Appearance.Button;
-      this.simpleLineagesCheckBox.Location = new System.Drawing.Point(36, 14);
-      this.simpleLineagesCheckBox.Name = "simpleLineagesCheckBox";
-      this.simpleLineagesCheckBox.Size = new System.Drawing.Size(24, 24);
-      this.simpleLineagesCheckBox.TabIndex = 12;
-      this.toolTip.SetToolTip(this.simpleLineagesCheckBox, "Simple lineages");
-      this.simpleLineagesCheckBox.UseVisualStyleBackColor = true;
-      this.simpleLineagesCheckBox.CheckedChanged += new System.EventHandler(this.simpleLineagesCheckBox_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.Chart = null;
-      this.genealogyGraphChart.GenealogyGraph = null;
-      this.genealogyGraphChart.Location = new System.Drawing.Point(3, 51);
+      this.genealogyGraphChart.Chart = new Chart(0, 0, genealogyGraphChart.PreferredSize.Width, genealogyGraphChart.PreferredSize.Height);
+      this.genealogyGraphChart.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.genealogyGraphChart.Location = new System.Drawing.Point(0, 0);
       this.genealogyGraphChart.LockGenealogy = false;
       this.genealogyGraphChart.Name = "genealogyGraphChart";
       this.genealogyGraphChart.ScaleOnResize = true;
       this.genealogyGraphChart.SimpleLineages = false;
-      this.genealogyGraphChart.Size = new System.Drawing.Size(1066, 724);
-      this.genealogyGraphChart.TabIndex = 7;
+      this.genealogyGraphChart.Size = new System.Drawing.Size(150, 150);
+      this.genealogyGraphChart.TabIndex = 0;
       // 
-      // GenealogyGraphView
+      // SymbolicDataAnalysisGenealogyView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.genealogyGraphChart);
-      this.Controls.Add(this.topControlBox);
-      this.Name = "GenealogyGraphView";
-      this.Size = new System.Drawing.Size(1072, 778);
-      this.topControlBox.ResumeLayout(false);
-      this.graphControlsGroupBox.ResumeLayout(false);
+      this.Name = "SymbolicDataAnalysisGenealogyView";
       this.ResumeLayout(false);
 
@@ -124 +54 @@
     #endregion
 
-    private System.Windows.Forms.ToolTip toolTip;
-    private System.Windows.Forms.Panel topControlBox;
-    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;
-
+    private EvolutionTracking.Views.GenealogyGraphChart genealogyGraphChart;
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphView.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.Linq;
-using System.Windows.Forms;
-using HeuristicLab.Core.Views;
+using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 
 namespace HeuristicLab.EvolutionTracking.Views {
-  [View("GenealogyGraph")]
-  [Content(typeof(GenealogyGraph), IsDefaultView = true)]
+  [View("GenealogyGraphView")]
+  [Content(typeof(GenealogyGraph), IsDefaultView = false)]
   public sealed partial class GenealogyGraphView : ItemView {
-    public new GenealogyGraph Content {
-      get { return (GenealogyGraph)base.Content; }
+    public new IGenealogyGraph Content {
+      get { return (IGenealogyGraph)base.Content; }
       set { base.Content = value; }
     }
 
-    public GenealogyGraphView()
-      : base() {
+    public GenealogyGraphView() {
       InitializeComponent();
-      // set button icons here because if set in the designer file, they get overwritten
-      this.highlightAllButton.Image = Common.Resources.VSImageLibrary.Gradient;
-      this.simpleLineagesCheckBox.Image = Common.Resources.VSImageLibrary.ArrowDown;
-      this.lockGenealogyCheckBox.Image = Common.Resources.VSImageLibrary.ProtectForm;
     }
 
     protected override void DeregisterContentEvents() {
       // TODO: Deregister your event handlers here
-      Content.GraphUpdated -= GenealogyGraphUpdated;
       base.DeregisterContentEvents();
     }
@@ -53 +23 @@
       base.RegisterContentEvents();
       // TODO: Register your event handlers here
-      Content.GraphUpdated += GenealogyGraphUpdated;
     }
 
     #region Event Handlers (Content)
     // TODO: Put event handlers of the content here
+    #endregion
+
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      //      genealogyGraphChart.GenealogyGraph = Content ?? null;
+      if (Content == null) {
+      } else {
+        genealogyGraphChart.GenealogyGraph = Content;
+      }
     }
-    private void Content_GraphChanged(object sender, EventArgs e) {
-    }
+
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      genealogyGraphChart.Enabled = Content != null;
+      // TODO: Enable or disable controls based on whether the content is null or the view is set readonly
     }
-    #endregion
 
     #region Event Handlers (child controls)
-    private void GenealogyGraphUpdated(object sender, EventArgs args) {
-      genealogyGraphChart.GenealogyGraph = Content;
-    }
-    void MatchNodesAndRepaint() {
-      genealogyGraphChart.Chart.UpdateEnabled = false;
-      genealogyGraphChart.ClearPrimitives(); // clear node colors
-
-      genealogyGraphChart.Chart.UpdateEnabled = true;
-      genealogyGraphChart.Chart.EnforceUpdate();
-    }
-
-    private void treeChart_SymbolicExpressionTreeNodeDoubleClicked(object sender, MouseEventArgs e) {
-    }
+    // TODO: Put event handlers of child controls here.
     #endregion
-    private void simpleLineagesCheckBox_CheckedChanged(object sender, EventArgs e) {
-      genealogyGraphChart.SimpleLineages = simpleLineagesCheckBox.Checked;
-    }
-
-    private void highlightAllButton_Click(object sender, EventArgs e) {
-    }
-
-    private void lockGenealogyCheckBox_CheckedChanged(object sender, EventArgs e) {
-      genealogyGraphChart.LockGenealogy = lockGenealogyCheckBox.Checked;
-    }
-
-    private void highlightRootParentsButton_Click(object sender, EventArgs e) {
-      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.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

@@ -132 +132 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="GenealogyGraphView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GenealogyGraphView.Designer.cs">
+      <DependentUpon>GenealogyGraphView.cs</DependentUpon>
+    </Compile>
     <Compile Include="VisualGenealogyGraphArc.cs" />
     <Compile Include="VisualGenealogyGraphNode.cs" />

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

@@ -23 +23 @@
 
 namespace HeuristicLab.EvolutionaryTracking.Views {
-  [Plugin("HeuristicLab.EvolutionaryTracking.Views", "Provides controls and views for the evolution graph and related structures.", "3.4.2.7439")]
-  [PluginFile("HeuristicLab.EvolutionaryTracking.Views-3.4.dll", PluginFileType.Assembly)]
+  [Plugin("HeuristicLab.EvolutionTracking.Views", "Provides controls and views for the evolution graph and related structures.", "3.4.2.7439")]
+  [PluginFile("HeuristicLab.EvolutionTracking.Views-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Core.Views", "3.3")]
@@ -34 +34 @@
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
   [PluginDependency("HeuristicLab.Visualization", "3.3")]
-  [PluginDependency("HeuristicLab.EvolutionaryTracking", "3.4")]
+  [PluginDependency("HeuristicLab.EvolutionTracking", "3.4")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs

@@ -12 +12 @@
   [StorableClass]
   [Item("GenealogyAnalyzer", "An analyzer which performs the necessary instrumentation to record the evolution of a genetic algorithm.")]
-  public class GenealogyAnalyzer<TGraph, TVertex, TContent> : SingleSuccessorOperator, IAnalyzer
-    where TGraph : class, IGenealogyGraph<TVertex, TContent>
-    where TVertex : class, IGenealogyGraphNode<TContent>, new()
-    where TContent : class, IItem {
+  public class GenealogyAnalyzer<T> : SingleSuccessorOperator, IAnalyzer
+  where T : class,IItem {
 
-    private AfterCrossoverOperator<TGraph, TVertex, TContent> afterCrossoverOperator;
-    private AfterManipulatorOperator<TGraph, TVertex, TContent> afterManipulatorOperator;
-    private BeforeManipulatorOperator<TGraph, TVertex, TContent> beforeManipulatorOperator;
+    private AfterCrossoverOperator<T> afterCrossoverOperator;
+    private AfterManipulatorOperator<T> afterManipulatorOperator;
+    private BeforeManipulatorOperator<T> beforeManipulatorOperator;
     public string CrossoverParentsParameterName { get; set; }
     public string CrossoverChildParameterName { get; set; }
@@ -25 +23 @@
 
     public IScopeTreeLookupParameter<DoubleValue> QualityParameter;
-    public IScopeTreeLookupParameter<TContent> PopulationParameter;
+    public IScopeTreeLookupParameter<T> PopulationParameter;
 
     private const string PopulationParameterName = "Population";
@@ -94 +92 @@
       get { return GenerationsParameter.ActualValue; }
     }
-    public IGenealogyGraph<TVertex, TContent> GenealogyGraph {
+    public IGenealogyGraph GenealogyGraph {
       get {
         IResult result;
         if (!Results.ContainsKey(PopulationGraphParameterName)) {
-          result = new Result(PopulationGraphParameterName, new GenealogyGraph<TVertex, TContent>());
+          result = new Result(PopulationGraphParameterName, new GenealogyGraph());
           Results.Add(result);
         } else {
           result = Results[PopulationGraphParameterName];
         }
-        var graph = (GenealogyGraph<TVertex, TContent>)result.Value;
+        var graph = (IGenealogyGraph)result.Value;
         return graph;
       }
@@ -121 +119 @@
       Parameters.Add(new LookupParameter<IntValue>(GenerationsParameterName, "The number of generations so far."));
       Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName));
-      PopulationParameter = new ScopeTreeLookupParameter<TContent>(PopulationParameterName);
+      PopulationParameter = new ScopeTreeLookupParameter<T>(PopulationParameterName);
       QualityParameter = new ScopeTreeLookupParameter<DoubleValue>(QualityParameterName);
       Parameters.Add(PopulationParameter);
@@ -127 +125 @@
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new GenealogyAnalyzer<TGraph, TVertex, TContent>(this, cloner);
+      return new GenealogyAnalyzer<T>(this, cloner);
     }
-    protected GenealogyAnalyzer(GenealogyAnalyzer<TGraph, TVertex, TContent> original, Cloner cloner)
+    protected GenealogyAnalyzer(GenealogyAnalyzer<T> original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -140 +138 @@
       if (Generations.Value == 0) {
         foreach (var individual in PopulationParameter.ActualValue) {
-          var vertex = new TVertex {
+          var vertex = new GenealogyGraphNode<T> {
             Content = individual,
             Rank = Generations.Value
@@ -149 +147 @@
         if (EnableCrossoverTracking.Value) {
           if (afterCrossoverOperator == null) {
-            afterCrossoverOperator = new AfterCrossoverOperator<TGraph, TVertex, TContent>();
+            afterCrossoverOperator = new AfterCrossoverOperator<T>();
             afterCrossoverOperator.ParentsParameter.ActualName = CrossoverParentsParameterName;
             afterCrossoverOperator.ChildParameter.ActualName = CrossoverChildParameterName;
@@ -159 +157 @@
         if (EnableManipulatorTracking.Value && Manipulator != null) {
           if (beforeManipulatorOperator == null) {
-            beforeManipulatorOperator = new BeforeManipulatorOperator<TGraph, TVertex, TContent>();
+            beforeManipulatorOperator = new BeforeManipulatorOperator<T>();
             beforeManipulatorOperator.ChildParameter.ActualName = ManipulatorChildParameterName;
           }
           if (afterManipulatorOperator == null) {
-            afterManipulatorOperator = new AfterManipulatorOperator<TGraph, TVertex, TContent>();
+            afterManipulatorOperator = new AfterManipulatorOperator<T>();
             afterManipulatorOperator.ChildParameter.ActualName = ManipulatorChildParameterName;
           }
@@ -173 +171 @@
         // add missing elite individuals in the current generation 
         // TODO: optimize for speed
-        var currGen = new HashSet<TContent>(GenealogyGraph.Ranks[Generations.Value].Select(x => x.Content));
+        var currGen = new HashSet<T>(GenealogyGraph.Ranks[Generations.Value].Cast<IGenealogyGraphNode<T>>().Select(x => x.Content));
         foreach (var individual in PopulationParameter.ActualValue) {
           if (currGen.Contains(individual)) continue;
           // it is an elite which was already added to the graph in the previous generation
-          var vertex = new TVertex {
+          var vertex = new GenealogyGraphNode<T> {
             Content = individual,
             Rank = Generations.Value,
@@ -189 +187 @@
       var qualities = QualityParameter.ActualValue.ToList();
       for (int i = 0; i < population.Count; ++i) {
-        foreach (var v in GenealogyGraph[population[i]]) {
+        foreach (var v in GenealogyGraph[population[i]].Cast<IGenealogyGraphNode<T>>()) {
           v.Quality = qualities[i].Value;
         }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/DirectedGraph.cs

@@ -31 +31 @@
   [Item("DirectedGraph", "Generic class representing a directed graph with custom vertices and content")]
   [StorableClass]
-  public class DirectedGraph<TVertex> : Item, IDirectedGraph<TVertex> where TVertex : class,IVertex {
+  public class DirectedGraph : Item, IDirectedGraph {
     [Storable]
-    protected readonly List<TVertex> nodes; // for performance reasons, maybe this should be a linked list (fast remove)
-    public List<TVertex> Nodes {
+    protected readonly List<IVertex> nodes; // for performance reasons, maybe this should be a linked list (fast remove)
+    public List<IVertex> Nodes {
       get { return nodes; }
     }
+    [Storable]
+    private readonly Dictionary<object, List<IVertex>> contentMap;
     public DirectedGraph() {
-      nodes = new List<TVertex>();
+      nodes = new List<IVertex>();
+      contentMap = new Dictionary<object, List<IVertex>>();
     }
     [StorableConstructor]
@@ -44 +47 @@
       : base(serializing) {
     }
-    protected DirectedGraph(DirectedGraph<TVertex> original, Cloner cloner)
+    protected DirectedGraph(DirectedGraph original, Cloner cloner)
       : base(original, cloner) {
-      nodes = new List<TVertex>(original.Nodes);
+      nodes = new List<IVertex>(original.Nodes);
+      contentMap = new Dictionary<object, List<IVertex>>(original.contentMap);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new DirectedGraph<TVertex>(this, cloner);
+      return new DirectedGraph(this, cloner);
     }
-    public bool Contains(TVertex t) {
+    public bool Contains(IVertex t) {
       return nodes.Contains(t);
     }
 
-    public virtual bool Any(Func<TVertex, bool> predicate) {
+    public bool Contains(object content) {
+      return contentMap.ContainsKey(content);
+    }
+    public List<IVertex> this[object key] {
+      get {
+        List<IVertex> result;
+        contentMap.TryGetValue(key, out result);
+        return result;
+      }
+    }
+    public virtual bool Any(Func<IVertex, bool> predicate) {
       return nodes.Any(predicate);
     }
@@ -61 +75 @@
       get { return !nodes.Any(); }
     }
-
     public virtual void Clear() {
       nodes.Clear();
     }
-
-    public virtual void AddVertex(TVertex vertex) {
+    public virtual void AddVertex(IVertex vertex) {
       Nodes.Add(vertex);
+      if (!contentMap.ContainsKey(vertex.Content))
+        contentMap[vertex.Content] = new List<IVertex>();
+      contentMap[vertex.Content].Add(vertex);
     }
 
-    public virtual void RemoveVertex(TVertex vertex) {
+    public virtual void RemoveVertex(IVertex vertex) {
       nodes.Remove(vertex);
     }
@@ -77 +92 @@
     }
   }
-
-  [Item("Directed graph", "Generic directed graph base class.")]
-  [StorableClass]
-  public class DirectedGraph<TVertex, TContent> : DirectedGraph<TVertex>, IDirectedGraph<TVertex, TContent>
-    where TVertex : class,IVertex<TContent>
-    where TContent : class,IItem {
-
-    [StorableConstructor]
-    protected DirectedGraph(bool deserializing) : base(deserializing) { }
-
-    [Storable]
-    private readonly Dictionary<TContent, List<TVertex>> contentMap; // reverse mapping of content to the actual vertices
-    public DirectedGraph() {
-      contentMap = new Dictionary<TContent, List<TVertex>>();
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new DirectedGraph<TVertex, TContent>(this, cloner);
-    }
-    protected DirectedGraph(DirectedGraph<TVertex, TContent> original, Cloner cloner)
-      : base(original, cloner) {
-      contentMap = new Dictionary<TContent, List<TVertex>>(original.contentMap);
-    }
-    public bool Contains(TContent content) {
-      return contentMap.ContainsKey(content);
-    }
-    public List<TVertex> this[TContent key] {
-      get {
-        List<TVertex> result = null;
-        contentMap.TryGetValue(key, out result);
-        return result;
-      }
-      //      set {
-      //        contentMap[key] = value;
-      //      }
-    }
-    public override void Clear() {
-      contentMap.Clear();
-      base.Clear();
-    }
-    public override void AddVertex(TVertex vertex) {
-      if (contentMap.ContainsKey(vertex.Content)) {
-        contentMap[vertex.Content].Add(vertex);
-      } else {
-        contentMap[vertex.Content] = new List<TVertex> { vertex };
-      }
-      base.AddVertex(vertex);
-    }
-
-    public override void RemoveVertex(TVertex vertex) {
-      if (contentMap.ContainsKey(vertex.Content)) {
-        contentMap[vertex.Content].Remove(vertex);
-      }
-      base.RemoveVertex(vertex);
-    }
-  }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/Interfaces/IDirectedGraph.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.EvolutionTracking {
-  public interface IDirectedGraph : IItem { }
-  public interface IDirectedGraph<TVertex> : IDirectedGraph
-    where TVertex : class, IVertex {
-    bool Contains(TVertex vertex);
-    bool Any(Func<TVertex, bool> predicate); // graph contains any nodes matching the given predicate?
-    void Clear(); // clear graph
-    void AddVertex(TVertex vertex);
-    void RemoveVertex(TVertex vertex); // remove node if contained in the graph
-    List<TVertex> Nodes { get; }
-  }
-  public interface IDirectedGraph<TVertex, in TContent> : IDirectedGraph<TVertex>
-    where TVertex : class, IVertex
-    where TContent : class, IItem {
-    bool Contains(TContent content); // graph contains node with given content?
+  public interface IDirectedGraph : IItem {
+    bool Contains(IVertex vertex);
+    bool Any(Func<IVertex, bool> predicate);
+    void Clear();
+    void AddVertex(IVertex vertex);
+    void RemoveVertex(IVertex vertex);
+    List<IVertex> Nodes { get; }
+    List<IVertex> this[object content] { get; }
+    bool Contains(object content);
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/Interfaces/IVertex.cs

@@ -40 +40 @@
     void AddReverseArc(IVertex target, double weight = 0.0, object content = null);
     void AddReverseArc(IArc arc);
+
+    object Content { get; set; }
   }
 
   public interface IVertex<T> : IVertex
   where T : class,IItem {
-    T Content { get; set; }
+    new T Content { get; set; }
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/Vertex.cs

@@ -55 +55 @@
     }
 
+    public object Content { get; set; }
+
     protected Vertex(Vertex original, Cloner cloner)
       : base(original, cloner) {
@@ -106 +108 @@
   [StorableClass]
   public class Vertex<T> : Vertex, IVertex<T> where T : class,IItem {
-    [Storable]
-    private T content;
-    public T Content {
-      get { return content; }
-      set {
-        if (value == null)
-          throw new ArgumentException("Node content cannot be null.");
-        content = value;
-      }
+    public new T Content {
+      get { return (T)base.Content; }
+      set { base.Content = value; }
     }
 
@@ -125 +121 @@
       : base(original, cloner) {
       Content = original.Content; // not sure if to Clone()
-
     }
 
@@ -131 +126 @@
       return new Vertex<T>(this, cloner);
     }
-
-    public Vertex(Vertex<T> node) {
-      Id = Guid.NewGuid().ToString();
-      Label = node.Label;
-      Content = node.Content;
-      InArcs = new List<IArc>(node.InArcs);
-      OutArcs = new List<IArc>(node.OutArcs);
-    }
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/FPGraph.cs

@@ -28 +28 @@
   [Item("Symbol graph", "A graph used to store the relationship between symbols in a population of individuals")]
   [StorableClass]
-  public class FPGraph : DirectedGraph<SymbolNode> {
+  public class FPGraph : DirectedGraph {
     [Storable]
     public Dictionary<int, List<SymbolNode>> Levels { get { return levels; } }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
 namespace HeuristicLab.EvolutionTracking {
   [StorableClass]
-  [Item("GenealogyGraph", "A class representing a genealogy graph")]
-  public class GenealogyGraph : GenealogyGraph<IGenealogyGraphNode> {
-  }
-
-  [StorableClass]
-  [Item("GenealogyGraph", "A class representing a genealogy graph (of a population of individuals) without storing any content for vertices")]
-  public class GenealogyGraph<TVertex> : DirectedGraph<TVertex>, IGenealogyGraph<TVertex> where TVertex : class,IGenealogyGraphNode {
+  [Item("GenealogyGraph", "")]
+  public class GenealogyGraph : DirectedGraph, IGenealogyGraph {
     [Storable]
-    private Dictionary<double, LinkedList<TVertex>> ranks; // use a linked list for fast insertion/removal
-
-    public Dictionary<double, LinkedList<TVertex>> Ranks {
+    private Dictionary<double, LinkedList<IGenealogyGraphNode>> ranks; // use a linked list for fast insertion/removal
+    public Dictionary<double, LinkedList<IGenealogyGraphNode>> Ranks {
       get { return ranks; }
       set { ranks = value; }
     }
-
+    protected GenealogyGraph(GenealogyGraph original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new GenealogyGraph<TVertex>(this, cloner);
-    }
-    protected GenealogyGraph(GenealogyGraph<TVertex> original, Cloner cloner)
-      : base(original, cloner) {
+      return new GenealogyGraph(this, cloner);
     }
     [StorableConstructor]
     protected GenealogyGraph(bool deserializing) : base(deserializing) { }
-
     public GenealogyGraph() {
-      Ranks = new Dictionary<double, LinkedList<TVertex>>();
+      Ranks = new Dictionary<double, LinkedList<IGenealogyGraphNode>>();
     }
-    public override void AddVertex(TVertex vertex) {
-      if (!Ranks.ContainsKey(vertex.Rank)) {
-        Ranks[vertex.Rank] = new LinkedList<TVertex>();
-      }
-      Ranks[vertex.Rank].AddLast(vertex);
+    public override void AddVertex(IVertex vertex) {
+      var ggn = (IGenealogyGraphNode)vertex;
+      if (!Ranks.ContainsKey(ggn.Rank))
+        Ranks[ggn.Rank] = new LinkedList<IGenealogyGraphNode>();
+      Ranks[ggn.Rank].AddLast(ggn);
       base.AddVertex(vertex);
     }
-    public override void RemoveVertex(TVertex vertex) {
-      if (Ranks.ContainsKey(vertex.Rank)) {
-        Ranks[vertex.Rank].Remove(vertex);
+    public override void RemoveVertex(IVertex vertex) {
+      var ggn = (IGenealogyGraphNode)vertex;
+      if (Ranks.ContainsKey(ggn.Rank)) {
+        Ranks[ggn.Rank].Remove(ggn);
       }
       base.RemoveVertex(vertex);
     }
-    // updated event
     public event EventHandler GraphUpdated;
     private void OnGraphUpdated(object sender, EventArgs args) {
@@ -74 +67 @@
       if (updated != null) updated(sender, args);
     }
+
+    public new List<IGenealogyGraphNode> this[object content] {
+      get {
+        var result = base[content];
+        return result != null ? result.Cast<IGenealogyGraphNode>().ToList() : null;
+      }
+    }
   }
 
-  [StorableClass]
-  [Item("GenealogyGraph",
-    "A class representing a genealogy graph (of a population of individuals) in which each vertex stores a content.")]
-  public class GenealogyGraph<TVertex, TContent> : DirectedGraph<TVertex, TContent>, IGenealogyGraph<TVertex, TContent>
-    where TVertex : class, IGenealogyGraphNode<TContent>
-    where TContent : class, IItem {
-    [Storable]
-    private Dictionary<double, LinkedList<TVertex>> ranks;
-    public Dictionary<double, LinkedList<TVertex>> Ranks {
-      get { return ranks; }
-      set { ranks = value; }
-    }
-    protected GenealogyGraph(GenealogyGraph<TVertex, TContent> original, Cloner cloner)
-      : base(original, cloner) {
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new GenealogyGraph<TVertex, TContent>(this, cloner);
-    }
-    public GenealogyGraph() {
-      Ranks = new Dictionary<double, LinkedList<TVertex>>();
-    }
-    public override void AddVertex(TVertex vertex) {
-      if (!Ranks.ContainsKey(vertex.Rank)) {
-        Ranks[vertex.Rank] = new LinkedList<TVertex>();
-      }
-      Ranks[vertex.Rank].AddLast(vertex);
-      base.AddVertex(vertex);
-    }
-    public override void RemoveVertex(TVertex vertex) {
-      if (Ranks.ContainsKey(vertex.Rank)) {
-        Ranks[vertex.Rank].Remove(vertex);
-      }
-      base.RemoveVertex(vertex);
-    }
-    // updated event
-    public event EventHandler GraphUpdated;
-    private void OnGraphUpdated(object sender, EventArgs args) {
-      var updated = GraphUpdated;
-      if (updated != null) updated(sender, args);
-    }
-  }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphNode.cs

@@ -110 +110 @@
     }
 
-    public new void AddForwardArc(IVertex target, double w = 0, object data = null) {
+    public new void AddForwardArc(IVertex target, double w = 0.0, object data = null) {
       var arc = new GenealogyGraphArc { Source = this, Target = (IGenealogyGraphNode)target, Data = data, Weight = w };
       base.AddForwardArc(arc);
@@ -122 +122 @@
   [StorableClass]
   [Item("GenealogyGraphNode", "A genealogy graph node which also has a Content")]
-  public class GenealogyGraphNode<T> : GenealogyGraphNode, IGenealogyGraphNode<T> where T : class,IItem {
-    public T Content { get; set; }
+  public class GenealogyGraphNode<T> : GenealogyGraphNode, IGenealogyGraphNode<T> where T : class, IItem {
+    public new T Content {
+      get { return (T)base.Content; }
+      set { base.Content = value; }
+    }
     public GenealogyGraphNode() { }
+    protected GenealogyGraphNode(GenealogyGraphNode<T> original, Cloner cloner)
+      : base(original, cloner) {
+      Content = original.Content;
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new GenealogyGraphNode<T>(this, cloner);
+    }
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/Interfaces/IGenealogyGraph.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.EvolutionTracking {
-
-
-  public interface IGenealogyGraph : IGenealogyGraph<IGenealogyGraphNode> {
-  }
-  public interface IGenealogyGraph<TVertex> : IDirectedGraph<TVertex> where TVertex : class, IGenealogyGraphNode {
-    Dictionary<double, LinkedList<TVertex>> Ranks { get; set; }
+  public interface IGenealogyGraph : IDirectedGraph {
+    Dictionary<double, LinkedList<IGenealogyGraphNode>> Ranks { get; set; }
   }
 
-  public interface IGenealogyGraph<TVertex, in TContent> : IDirectedGraph<TVertex, TContent>, IGenealogyGraph<TVertex>
-    where TVertex : class, IGenealogyGraphNode<TContent>
-    where TContent : class, IItem {
-
-    List<TVertex> this[TContent content] { get; }
+  public interface IGenealogyGraph<T> : IDirectedGraph
+    where T : class,IItem {
+    Dictionary<double, LinkedList<IGenealogyGraphNode<T>>> Ranks { get; set; }
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/Interfaces/IGenealogyGraphNode.cs

@@ -36 +36 @@
   }
 
-  public interface IGenealogyGraphNode<T> : IGenealogyGraphNode, IVertex<T> where T : class,IItem {
-
-  }
-
+  public interface IGenealogyGraphNode<T> : IGenealogyGraphNode, IVertex<T> where T : class,IItem { }
 }

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>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
 </Project>

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

@@ -29 +29 @@
   [StorableClass]
   [Item("AfterCrossoverOperator", "A generic operator that can record genealogical relationships between crossover parents and children.")]
-  public class AfterCrossoverOperator<TGraph, TVertex, TContent> : EvolutionTrackingOperator<TGraph, TVertex, TContent>
-    where TGraph : class,IGenealogyGraph<TVertex, TContent>
-    where TVertex : class,IGenealogyGraphNode<TContent>, new()
-    where TContent : class,IItem {
+  public class AfterCrossoverOperator<T> : EvolutionTrackingOperator
+    where T : class,IItem {
     private const string defaultParentsParameterName = "Parents";
     private const string defaultChildParameterName = "Child";
-    public IScopeTreeLookupParameter<TContent> ParentsParameter;
-    public ILookupParameter<TContent> ChildParameter;
+    public IScopeTreeLookupParameter<T> ParentsParameter;
+    public ILookupParameter<T> ChildParameter;
 
-    protected AfterCrossoverOperator(AfterCrossoverOperator<TGraph, TVertex, TContent> original, Cloner cloner)
+    protected AfterCrossoverOperator(AfterCrossoverOperator<T> original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new AfterCrossoverOperator<TGraph, TVertex, TContent>(this, cloner);
+      return new AfterCrossoverOperator<T>(this, cloner);
     }
 
     public AfterCrossoverOperator() {
-      ParentsParameter = new ScopeTreeLookupParameter<TContent>(defaultParentsParameterName);
-      ChildParameter = new LookupParameter<TContent>(defaultChildParameterName);
+      ParentsParameter = new ScopeTreeLookupParameter<T>(defaultParentsParameterName);
+      ChildParameter = new LookupParameter<T>(defaultChildParameterName);
       Parameters.Add(ParentsParameter);
       Parameters.Add(ChildParameter);
@@ -57 +55 @@
       var parentVertices = ExecutionContext.Scope.SubScopes.Select(s => lastGen[int.Parse(s.Name)]).ToList(); // because the individuals in the execution scope are copies of the ones in the graph
 
-      var childVertex = new TVertex {
+      var childVertex = new GenealogyGraphNode<T> {
         Content = ChildParameter.ActualValue,
         Rank = parentVertices[0].Rank + 1

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

@@ -28 +28 @@
   [StorableClass]
   [Item("AfterCrossoverOperator", "Performs an action after the crossover operator is applied.")]
-  public class AfterManipulatorOperator<TGraph, TVertex, TContent> : EvolutionTrackingOperator<TGraph, TVertex, TContent>
-    where TGraph : class,IGenealogyGraph<TVertex, TContent>
-    where TVertex : class,IGenealogyGraphNode<TContent>, new()
-    where TContent : class,IItem {
+  public class AfterManipulatorOperator<T> : EvolutionTrackingOperator
+    where T : class,IItem {
 
     private const string ChildParameterName = "Child";
-    public ILookupParameter<TContent> ChildParameter;
+    public ILookupParameter<T> ChildParameter;
 
-    protected AfterManipulatorOperator(AfterManipulatorOperator<TGraph, TVertex, TContent> original, Cloner cloner)
+    protected AfterManipulatorOperator(AfterManipulatorOperator<T> original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new AfterManipulatorOperator<TGraph, TVertex, TContent>(this, cloner);
+      return new AfterManipulatorOperator<T>(this, cloner);
     }
 
     public AfterManipulatorOperator() {
-      ChildParameter = new LookupParameter<TContent>(ChildParameterName);
+      ChildParameter = new LookupParameter<T>(ChildParameterName);
       Parameters.Add(ChildParameter);
     }

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

@@ -26 +26 @@
   [StorableClass]
   [Item("AfterSolutionCreatorOperator", "An operator that runs after the solution creator and performs additional actions.")]
-  public class AfterSolutionCreatorOperator<TGraph, TVertex, TContent> : EvolutionTrackingOperator<TGraph, TVertex, TContent>
-    where TGraph : class,IGenealogyGraph<TVertex, TContent>
-    where TVertex : class,IGenealogyGraphNode<TContent>, new()
-    where TContent : class,IItem {
+  public class AfterSolutionCreatorOperator<T> : EvolutionTrackingOperator
+    where T : class,IItem {
 
     public override IOperation Apply() {

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

@@ -29 +29 @@
   [StorableClass]
   [Item("AfterCrossoverOperator", "Performs an action after the crossover operator is applied.")]
-  public class BeforeManipulatorOperator<TGraph, TVertex, TContent> : EvolutionTrackingOperator<TGraph, TVertex, TContent>
-    where TGraph : class,IGenealogyGraph<TVertex, TContent>
-    where TVertex : class,IGenealogyGraphNode<TContent>, new()
-    where TContent : class,IItem {
+  public class BeforeManipulatorOperator<T> : EvolutionTrackingOperator
+    where T : class,IItem {
 
     private const string ChildParameterName = "Child";
-    public ILookupParameter<TContent> ChildParameter;
+    public ILookupParameter<T> ChildParameter;
 
-    protected BeforeManipulatorOperator(BeforeManipulatorOperator<TGraph, TVertex, TContent> original, Cloner cloner)
+    protected BeforeManipulatorOperator(BeforeManipulatorOperator<T> original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new BeforeManipulatorOperator<TGraph, TVertex, TContent>(this, cloner);
+      return new BeforeManipulatorOperator<T>(this, cloner);
     }
 
     public BeforeManipulatorOperator() {
-      ChildParameter = new LookupParameter<TContent>(ChildParameterName);
+      ChildParameter = new LookupParameter<T>(ChildParameterName);
       Parameters.Add(ChildParameter);
     }
@@ -52 +50 @@
       if (GenealogyGraph.Contains(ChildParameter.ActualValue)) {
         var child = ChildParameter.ActualValue;
-        var clone = (TContent)child.Clone();
-        var vChild = GenealogyGraph[child].Last();
-        var vClone = new TVertex { Content = clone, Rank = vChild.Rank - 0.5 };
+        var clone = (T)child.Clone();
+        var vChild = (IGenealogyGraphNode<T>)GenealogyGraph[child].Last();
+        var vClone = new GenealogyGraphNode<T> { Content = clone, Rank = vChild.Rank - 0.5 };
         GenealogyGraph.AddVertex(vClone);
         // adjust parent-child(clone) relationship in the graph
@@ -69 +67 @@
         vClone.AddForwardArc(vChild);
       } else { // this needs to be checked
-        var vChild = new TVertex { Content = ChildParameter.ActualValue, Rank = Generations.Value };
+        var vChild = new GenealogyGraphNode<T> { Content = ChildParameter.ActualValue, Rank = Generations.Value };
         GenealogyGraph.AddVertex(vChild);
       }

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

@@ -28 +28 @@
 
 namespace HeuristicLab.EvolutionTracking {
-  public class EvolutionTrackingOperator<TGraph, TVertex, TContent> : SingleSuccessorOperator
-    where TGraph : class,IGenealogyGraph<TVertex, TContent>
-    where TVertex : class,IGenealogyGraphNode<TContent>
-    where TContent : class,IItem {
+  public class EvolutionTrackingOperator : SingleSuccessorOperator {
     // evolution tracking-related parameters
     private const string resultsParameterName = "Results";
@@ -49 +46 @@
       get { return GenerationsParameter.ActualValue; }
     }
-    public IGenealogyGraph<TVertex, TContent> GenealogyGraph {
+    public IGenealogyGraph GenealogyGraph {
       get {
         IResult result;
         if (!Results.ContainsKey(populationGraphParameterName)) {
-          result = new Result(populationGraphParameterName, new GenealogyGraph<TVertex, TContent>());
+          result = new Result(populationGraphParameterName, new GenealogyGraph());
           Results.Add(result);
         } else {
           result = Results[populationGraphParameterName];
         }
-        var graph = (GenealogyGraph<TVertex, TContent>)result.Value;
+        var graph = (GenealogyGraph)result.Value;
         return graph;
       }
@@ -66 +63 @@
       Parameters.Add(new LookupParameter<ResultCollection>(resultsParameterName));
     }
-    protected EvolutionTrackingOperator(EvolutionTrackingOperator<TGraph, TVertex, TContent> original, Cloner cloner)
+    protected EvolutionTrackingOperator(EvolutionTrackingOperator original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new EvolutionTrackingOperator<TGraph, TVertex, TContent>(this, cloner);
+      return new EvolutionTrackingOperator(this, cloner);
     }
   }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Plugin.cs

@@ -24 +24 @@
 namespace HeuristicLab.EvolutionTracking {
   [Plugin("HeuristicLab.EvolutionTracking", "Provides operators and related classes for tracking the evolution within a GA.", "3.4.2.7439")]
-  [PluginFile("HeuristicLab.EvolutionaryTracking-3.4.dll", PluginFileType.Assembly)]
+  [PluginFile("HeuristicLab.EvolutionTracking-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/SymbolGraph.cs

@@ -29 +29 @@
   [Item("Symbol graph", "A graph used to store the relationship between symbols in a population of individuals")]
   [StorableClass]
-  public class SymbolGraph : DirectedGraph<SymbolNode> {
+  public class SymbolGraph : DirectedGraph {
     [Storable]
     private readonly Dictionary<string, SymbolNode> nodeMap = new Dictionary<string, SymbolNode>();
 
-    public override void AddVertex(SymbolNode node) {
+    public void AddVertex(SymbolNode node) {
       if (nodeMap.ContainsKey(node.Label)) return; // node already present? do nothing
       nodeMap[node.Label] = node;

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

@@ -219 +219 @@
       <DependentUpon>SlidingWindowDataView.cs</DependentUpon>
     </Compile>
-    <Compile Include="SymbolicDataAnalysisGenealogyView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SymbolicDataAnalysisGenealogyView.Designer.cs">
-      <DependentUpon>SymbolicDataAnalysisGenealogyView.cs</DependentUpon>
-    </Compile>
     <Compile Include="TextualSymbolicDataAnalysisModelView.cs">
       <SubType>UserControl</SubType>

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisGenealogyAnalyzer.cs

@@ -7 +7 @@
   [StorableClass]
   [Item("SymbolicDataAnalysisGenealogyAnalyzer", "")]
-  public class SymbolicDataAnalysisGenealogyAnalyzer : GenealogyAnalyzer<IGenealogyGraph<GenealogyGraphNode<ISymbolicExpressionTree>, ISymbolicExpressionTree>,
-    GenealogyGraphNode<ISymbolicExpressionTree>, ISymbolicExpressionTree> {
+  public class SymbolicDataAnalysisGenealogyAnalyzer : GenealogyAnalyzer<ISymbolicExpressionTree> {
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Creators/MultiSymbolicDataAnalysisExpressionCreator.cs

@@ -95 +95 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       if (ClonedSymbolicExpressionTreeGrammarParameter.ActualValue == null) {
         SymbolicExpressionTreeGrammarParameter.ActualValue.ReadOnly = true;
@@ -104 +104 @@
         globalScope.Variables.Add(new Core.Variable(ClonedSymbolicExpressionTreeGrammarParameterName, (ISymbolicExpressionGrammar)SymbolicExpressionTreeGrammarParameter.ActualValue.Clone()));
       }
-      return base.Apply();
+      return base.InstrumentedApply();
     }
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisSingleObjectiveProblem.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-
-using TGraph = HeuristicLab.EvolutionTracking.IGenealogyGraph<HeuristicLab.EvolutionTracking.GenealogyGraphNode<HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.ISymbolicExpressionTree>,
-                                                              HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.ISymbolicExpressionTree>;
-using TVertex = HeuristicLab.EvolutionTracking.GenealogyGraphNode<HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.ISymbolicExpressionTree>;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
@@ -122 +118 @@
       }
 
-      foreach (var op in Operators.OfType<GenealogyAnalyzer<TGraph, TVertex, ISymbolicExpressionTree>>()) {
+      foreach (var op in Operators.OfType<GenealogyAnalyzer<ISymbolicExpressionTree>>()) {
         op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
         op.PopulationParameter.ActualName = Evaluator.SymbolicExpressionTreeParameter.ActualName;

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman.Views/3.3/HeuristicLab.Problems.TravelingSalesman.Views-3.3.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>
@@ -60 +60 @@
   <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>
@@ -68 +68 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
@@ -80 +80 @@
   <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>
@@ -88 +88 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
@@ -99 +99 @@
   </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.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.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.Encodings.PermutationEncoding-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-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.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.Parameters-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-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.Instances-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Visualization-3.3, Version=3.3.0.9491, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Visualization-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -153 +210 @@
   </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 Include="..\..\HeuristicLab.EvolutionTracking.Views\3.4\HeuristicLab.EvolutionTracking.Views-3.4.csproj">
+      <Project>{318dfe8c-ca23-4f1b-a4ac-62b425060241}</Project>
+      <Name>HeuristicLab.EvolutionTracking.Views-3.4</Name>
     </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\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.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
-      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
-      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</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.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.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.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.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 Include="..\..\HeuristicLab.EvolutionTracking\3.4\HeuristicLab.EvolutionTracking-3.4.csproj">
+      <Project>{1f75cea3-464f-4a6f-b2f0-04b9841ebc16}</Project>
+      <Name>HeuristicLab.EvolutionTracking-3.4</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.TravelingSalesman\3.3\HeuristicLab.Problems.TravelingSalesman-3.3.csproj">
-      <Project>{D767C38D-8014-46B0-9A32-03A3AECCE34A}</Project>
+      <Project>{d767c38d-8014-46b0-9a32-03a3aecce34a}</Project>
       <Name>HeuristicLab.Problems.TravelingSalesman-3.3</Name>
       <Private>False</Private>
@@ -233 +233 @@
   -->
   <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)
@@ -240 +240 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.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>
@@ -52 +52 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -63 +63 @@
   <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>
@@ -71 +71 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
@@ -83 +83 @@
   <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>
@@ -91 +91 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
@@ -102 +102 @@
   </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, 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.Encodings.PermutationEncoding-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-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.Instances-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -113 +170 @@
   <ItemGroup>
     <Compile Include="Analyzers\BestTSPSolutionAnalyzer.cs" />
+    <Compile Include="Analyzers\TSPGenealogyAnalyzer.cs" />
     <Compile Include="Analyzers\TSPPopulationDiversityAnalyzer.cs" />
     <Compile Include="Analyzers\TSPAlleleFrequencyAnalyzer.cs" />
@@ -150 +208 @@
   </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.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
-      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
-      <Name>HeuristicLab.Encodings.PermutationEncoding-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>
-    </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.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>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />
@@ -242 +229 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <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="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -251 +244 @@
   -->
   <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)
@@ -258 +251 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -34 +34 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.Instances;
+using HeuristicLab.Problems.TravelingSalesman.Analyzers;
 
 namespace HeuristicLab.Problems.TravelingSalesman {
@@ -84 +85 @@
     private SingleObjectivePopulationDiversityAnalyzer SingleObjectivePopulationDiversityAnalyzer {
       get { return Operators.OfType<SingleObjectivePopulationDiversityAnalyzer>().FirstOrDefault(); }
+    }
+
+    private TSPGenealogyAnalyzer TSPGenealogyAnalyzer {
+      get { return Operators.OfType<TSPGenealogyAnalyzer>().FirstOrDefault(); }
+    }
+    private IPermutationCrossover TSPCrossover {
+      get { return Operators.OfType<IPermutationCrossover>().FirstOrDefault(); }
+    }
+
+    private IPermutationManipulator TSPManipulator {
+      get { return Operators.OfType<IPermutationManipulator>().FirstOrDefault(); }
     }
     #endregion
@@ -240 +252 @@
       Operators.Add(new TSPAlleleFrequencyAnalyzer());
       Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
+      Operators.Add(new TSPGenealogyAnalyzer());
       ParameterizeAnalyzers();
       var operators = new HashSet<IPermutationOperator>(new IPermutationOperator[] {
@@ -326 +339 @@
         SingleObjectivePopulationDiversityAnalyzer.SimilarityCalculator = Operators.OfType<TSPSimilarityCalculator>().SingleOrDefault();
       }
+
     }
     private void ParameterizeOperators() {
@@ -369 +383 @@
         op.SolutionVariableName = SolutionCreator.PermutationParameter.ActualName;
         op.QualityVariableName = Evaluator.QualityParameter.ActualName;
+      }
+      if (TSPGenealogyAnalyzer != null) {
+        if (TSPCrossover != null) {
+          TSPGenealogyAnalyzer.CrossoverParentsParameterName = TSPCrossover.ParentsParameter.Name;
+          TSPGenealogyAnalyzer.CrossoverChildParameterName = TSPCrossover.ChildParameter.Name;
+        }
+        if (TSPManipulator != null) {
+          TSPGenealogyAnalyzer.ManipulatorChildParameterName = TSPManipulator.PermutationParameter.Name;
+        }
+        TSPGenealogyAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        if (Evaluator is ITSPPathEvaluator) {
+          TSPGenealogyAnalyzer.PopulationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
+        } else {
+          throw new Exception("Unknown Evaluator. Could not parameterize genealogy analyzer.");
+        }
       }
     }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Tracking.sln

@@ -24 +24 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4", "HeuristicLab.Problems.DataAnalysis.Symbolic.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj", "{7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.TravelingSalesman-3.3", "HeuristicLab.Problems.TravelingSalesman\3.3\HeuristicLab.Problems.TravelingSalesman-3.3.csproj", "{D767C38D-8014-46B0-9A32-03A3AECCE34A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.TravelingSalesman.Views-3.3", "HeuristicLab.Problems.TravelingSalesman.Views\3.3\HeuristicLab.Problems.TravelingSalesman.Views-3.3.csproj", "{CDA28124-ACD0-4231-8EB0-C510B361F84E}"
 EndProject
 Global
@@ -129 +133 @@
     {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Release|x86.ActiveCfg = Release|x86
     {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Release|x86.Build.0 = Release|x86
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Debug|Mixed Platforms.Build.0 = Debug|x86
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Debug|x64.ActiveCfg = Debug|x64
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Debug|x64.Build.0 = Debug|x64
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Debug|x86.ActiveCfg = Debug|x86
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Debug|x86.Build.0 = Debug|x86
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Release|Any CPU.Build.0 = Release|Any CPU
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Release|Mixed Platforms.ActiveCfg = Release|x86
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Release|Mixed Platforms.Build.0 = Release|x86
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Release|x64.ActiveCfg = Release|x64
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Release|x64.Build.0 = Release|x64
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Release|x86.ActiveCfg = Release|x86
+    {D767C38D-8014-46B0-9A32-03A3AECCE34A}.Release|x86.Build.0 = Release|x86
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Debug|Mixed Platforms.Build.0 = Debug|x86
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Debug|x64.ActiveCfg = Debug|x64
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Debug|x64.Build.0 = Debug|x64
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Debug|x86.ActiveCfg = Debug|x86
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Debug|x86.Build.0 = Debug|x86
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Release|Any CPU.Build.0 = Release|Any CPU
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Release|Mixed Platforms.ActiveCfg = Release|x86
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Release|Mixed Platforms.Build.0 = Release|x86
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Release|x64.ActiveCfg = Release|x64
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Release|x64.Build.0 = Release|x64
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Release|x86.ActiveCfg = Release|x86
+    {CDA28124-ACD0-4231-8EB0-C510B361F84E}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution