Changeset 12951 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking

Timestamp:

09/15/15 00:10:33 (9 years ago)

Author:

bburlacu

Message:

#1772:

• Slight refactor in QueryMatch.cs
• Added a parameter to the genealogy analyzer for removing older generations from the graph (useful to conserve memory in experiments)
• Updated wildcard nodes (added persistence & cloning)
• Implemented diversification strategy based on schema frequencies & phenotypic similarity as a separate operator (for now keep also the analyzer)
• Updated license headers
• Added QueryMatch performance test (to be expanded)

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4

Files:

• Analyzers/GenealogyAnalyzer.cs (modified) (5 diffs)
• Operators/BeforeManipulatorOperator.cs (modified) (2 diffs)
• Operators/EvolutionTrackingOperator.cs (modified) (4 diffs)

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

@@ -55 +55 @@
     private const string EnableManipulatorTrackingParameterName = "EnableManipulatorTracking";
     private const string EnableSolutionCreatorTrackingParameterName = "EnableSolutionCreatorTracking"; // should always be enabled. maybe superfluous
+    private const string TrimOlderGenerationsParameterName = "TrimOlderGenerations";
     #endregion parameter names
 
     #region parameter properties
+
+    public IFixedValueParameter<BoolValue> TrimOlderGenerationsParameter {
+      get { return (IFixedValueParameter<BoolValue>)Parameters[TrimOlderGenerationsParameterName]; }
+    }
+
     public IScopeTreeLookupParameter<DoubleValue> QualityParameter {
       get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters[QualityParameterName]; }
@@ -142 +148 @@
     public BoolValue EnableSolutionCreatorTracking {
       get { return EnableSolutionCreatorTrackingParameter.Value; }
+    }
+
+    public bool TrimOlderGenerations {
+      get { return TrimOlderGenerationsParameter.Value.Value; }
     }
     #endregion properties
@@ -164 +174 @@
       Parameters.Add(new ValueParameter<IManipulatorOperator<T>>(BeforeManipulatorOperatorParameterName));
       Parameters.Add(new ValueParameter<IManipulatorOperator<T>>(AfterManipulatorOperatorParameterName));
+      Parameters.Add(new FixedValueParameter<BoolValue>(TrimOlderGenerationsParameterName, "Remove all the generations older than the last generation from the genealoy graph to save memory."));
       #endregion add parameters
     }
@@ -201 +212 @@
         Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>(QualityParameterName, "The individual qualities."));
       }
+      if (!Parameters.ContainsKey(TrimOlderGenerationsParameterName))
+        Parameters.Add(new FixedValueParameter<BoolValue>(TrimOlderGenerationsParameterName, "Remove all the generations older than the last generation from the genealoy graph to save memory."));
     }
 
@@ -318 +331 @@
       genealogyGraph.RemoveVertices(discarded);
 
+      //trim
+      if (TrimOlderGenerations) {
+        for (int i = 0; i < generation - 1; ++i) {
+          var vertices = genealogyGraph.GetByRank(i).ToList();
+          genealogyGraph.RemoveVertices(vertices);
+        }
+      }
+
       return base.Apply();
     }

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29 +29 @@
   [StorableClass]
   [Item("AfterCrossoverOperator", "Performs an action after the crossover operator is applied.")]
-  public class BeforeManipulatorOperator<T> : EvolutionTrackingOperator<T>, IManipulatorOperator<T> where T : class,IItem {
+  public class BeforeManipulatorOperator<T> : EvolutionTrackingOperator<T>, IManipulatorOperator<T> where T : class, IItem {
     private const string ChildParameterName = "Child";
 

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -31 +31 @@
   [Item("EvolutionTrackingOperator", "A base operator which facilitates access to the genealogy graph.")]
   [StorableClass]
-  public class EvolutionTrackingOperator<T> : SingleSuccessorOperator where T : class,IItem {
+  public class EvolutionTrackingOperator<T> : SingleSuccessorOperator where T : class, IItem {
     // evolution tracking-related parameters
-    private const string resultsParameterName = "Results";
-    private const string populationGraphParameterName = "PopulationGraph";
-    private const string generationsParameterName = "Generations";
+    private const string ResultsParameterName = "Results";
+    private const string PopulationGraphParameterName = "PopulationGraph";
+    private const string GenerationsParameterName = "Generations";
 
     public ILookupParameter<ResultCollection> ResultsParameter {
-      get { return (ILookupParameter<ResultCollection>)Parameters[resultsParameterName]; }
+      get { return (ILookupParameter<ResultCollection>)Parameters[ResultsParameterName]; }
     }
     public ILookupParameter<IntValue> GenerationsParameter {
-      get { return (ILookupParameter<IntValue>)Parameters[generationsParameterName]; }
+      get { return (ILookupParameter<IntValue>)Parameters[GenerationsParameterName]; }
     }
     public ResultCollection Results {
@@ -52 +52 @@
       get {
         IResult result;
-        if (!Results.ContainsKey(populationGraphParameterName)) {
-          result = new Result(populationGraphParameterName, new GenealogyGraph<T>());
+        if (!Results.ContainsKey(PopulationGraphParameterName)) {
+          result = new Result(PopulationGraphParameterName, new GenealogyGraph<T>());
           Results.Add(result);
         } else {
-          result = Results[populationGraphParameterName];
+          result = Results[PopulationGraphParameterName];
         }
         var graph = (GenealogyGraph<T>)result.Value;
@@ -63 +63 @@
     }
     public EvolutionTrackingOperator() {
-      Parameters.Add(new LookupParameter<IntValue>(generationsParameterName));
-      Parameters.Add(new LookupParameter<ResultCollection>(resultsParameterName));
+      Parameters.Add(new LookupParameter<IntValue>(GenerationsParameterName));
+      Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName));
     }
     protected EvolutionTrackingOperator(EvolutionTrackingOperator<T> original, Cloner cloner)