Changeset 10886 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers

Timestamp:

05/22/14 13:49:35 (10 years ago)

Author:

bburlacu

Message:

#1772: Simplified GenealogyGraph (and related components) API in an effort to improve speed and memory consumption (eg., by sharing the same arc when walking the graph in both directions: parent-child and child-parent).

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs (modified) (4 diffs)

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

@@ -54 +54 @@
     private const string EnableSolutionCreatorTrackingParameterName = "EnableSolutionCreatorTracking"; // should always be enabled. maybe superfluous
 
-    public string CrossoverParentsParameterName { get; set; }
-    public string CrossoverChildParameterName { get; set; }
-    public string ManipulatorChildParameterName { get; set; }
-
+    #region parameter properties
     public IScopeTreeLookupParameter<DoubleValue> QualityParameter {
       get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters[QualityParameterName]; }
     }
-
     public IScopeTreeLookupParameter<T> PopulationParameter {
       get { return (IScopeTreeLookupParameter<T>)Parameters[PopulationParameterName]; }
     }
-
     public IValueParameter<ICrossoverOperator<T>> BeforeCrossoverOperatorParameter {
       get { return (IValueParameter<ICrossoverOperator<T>>)Parameters[BeforeCrossoverOperatorParameterName]; }
@@ -78 +73 @@
       get { return (IValueParameter<IManipulatorOperator<T>>)Parameters[AfterManipulatorOperatorParameterName]; }
     }
-
-    #region parameter properties
     public ILookupParameter<ResultCollection> ResultsParameter {
       get { return (ILookupParameter<ResultCollection>)Parameters[ResultsParameterName]; }
@@ -265 +258 @@
         }
       } else {
+        // TODO: eliminate from the graph extra vertices added by the recombination operators when filling the pool of offspring with offspring selection
+
         var elite = population.FirstOrDefault(x => GenealogyGraph.Contains(x));
         if (elite != null) {
@@ -282 +277 @@
           GenealogyGraph[vertex.Content] = vertex;
           GenealogyGraph[previousVertex.Content] = previousVertex;
-          // connect current elite with previous elite
-          previousVertex.AddForwardArc(vertex);
-          vertex.AddReverseArc(previousVertex);
+          GenealogyGraph.AddArc(previousVertex, vertex); // connect current elite with previous elite
           vertex.Id = previousVertex.Id; // another way would be to introduce the vertex.Id into the scope of the elite
           vertex.Quality = previousVertex.Quality;