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

Timestamp:

01/16/14 16:37:56 (10 years ago)

Author:

bburlacu

Message:

#1772: Small changes to the GenealogyGraph. Added generic Fragment class and interface. Added the SymbolicDataAnalysisPopulationDiversityAnalyzer. Added specialized tracking operators for symbolic data analysis. Merged trunk changes.

File:

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

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

@@ -15 +15 @@
   where T : class,IItem {
 
-    private AfterCrossoverOperator<T> afterCrossoverOperator;
-    private AfterManipulatorOperator<T> afterManipulatorOperator;
-    private BeforeManipulatorOperator<T> beforeManipulatorOperator;
     public string CrossoverParentsParameterName { get; set; }
     public string CrossoverChildParameterName { get; set; }
@@ -24 +21 @@
     public IScopeTreeLookupParameter<DoubleValue> QualityParameter;
     public IScopeTreeLookupParameter<T> PopulationParameter;
+
+    public ICrossoverOperator<T> BeforeCrossoverOperator { get; set; }
+    public ICrossoverOperator<T> AfterCrossoverOperator { get; set; }
+    public IManipulatorOperator<T> BeforeManipulatorOperator { get; set; }
+    public IManipulatorOperator<T> AfterManipulatorOperator { get; set; }
 
     private const string PopulationParameterName = "Population";
@@ -130 +132 @@
       : base(original, cloner) {
     }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      // the instrumented operators
+      if (!Parameters.ContainsKey(CrossoverParameterName))
+        Parameters.Add(new LookupParameter<ICrossover>(CrossoverParameterName, "The crossover operator."));
+      if (!Parameters.ContainsKey(ManipulatorParameterName))
+        Parameters.Add(new LookupParameter<IManipulator>(ManipulatorParameterName, "The manipulator operator."));
+      if (!Parameters.ContainsKey(SolutionCreatorParameterName))
+        Parameters.Add(new LookupParameter<ISolutionCreator>(SolutionCreatorParameterName, "The solution creator operator."));
+      // the analyzer parameters
+      if (!Parameters.ContainsKey(EnableCrossoverTrackingParameterName))
+        Parameters.Add(new ValueParameter<BoolValue>(EnableCrossoverTrackingParameterName, new BoolValue(true)));
+      if (!Parameters.ContainsKey(EnableManipulatorTrackingParameterName))
+        Parameters.Add(new ValueParameter<BoolValue>(EnableManipulatorTrackingParameterName, new BoolValue(true)));
+      if (!Parameters.ContainsKey(EnableSolutionCreatorTrackingParameterName))
+        Parameters.Add(new ValueParameter<BoolValue>(EnableSolutionCreatorTrackingParameterName, new BoolValue(true)));
+      // parameters required by the analyzer to do its work
+      if (!Parameters.ContainsKey(GenerationsParameterName))
+        Parameters.Add(new LookupParameter<IntValue>(GenerationsParameterName, "The number of generations so far."));
+      if (!Parameters.ContainsKey(ResultsParameterName))
+        Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName));
+      if (!Parameters.ContainsKey(PopulationParameterName)) {
+        PopulationParameter = new ScopeTreeLookupParameter<T>(PopulationParameterName);
+        Parameters.Add(PopulationParameter);
+      }
+      if (!Parameters.ContainsKey(QualityParameterName)) {
+        QualityParameter = new ScopeTreeLookupParameter<DoubleValue>(QualityParameterName);
+        Parameters.Add(QualityParameter);
+      }
+    }
 
     public bool EnabledByDefault {
@@ -146 +178 @@
         // at the beginning we add the before/after operators to the instrumented operators
         if (EnableCrossoverTracking.Value) {
-          if (afterCrossoverOperator == null) {
-            afterCrossoverOperator = new AfterCrossoverOperator<T>();
-            afterCrossoverOperator.ParentsParameter.ActualName = CrossoverParentsParameterName;
-            afterCrossoverOperator.ChildParameter.ActualName = CrossoverChildParameterName;
-          }
-          var instrumentedCrossover = (InstrumentedOperator)Crossover;
-          instrumentedCrossover.AfterExecutionOperators.Add(afterCrossoverOperator);
+          if (BeforeCrossoverOperator != null) {
+            BeforeCrossoverOperator.ParentsParameter.ActualName = CrossoverParentsParameterName;
+            BeforeCrossoverOperator.ChildParameter.ActualName = CrossoverChildParameterName;
+            var instrumentedCrossover = (InstrumentedOperator)Crossover;
+            instrumentedCrossover.BeforeExecutionOperators.Add(BeforeCrossoverOperator);
+          }
+          if (AfterCrossoverOperator != null) {
+            AfterCrossoverOperator.ParentsParameter.ActualName = CrossoverParentsParameterName;
+            AfterCrossoverOperator.ChildParameter.ActualName = CrossoverChildParameterName;
+            var instrumentedCrossover = (InstrumentedOperator)Crossover;
+            instrumentedCrossover.AfterExecutionOperators.Add(AfterCrossoverOperator);
+          }
         }
 
         if (EnableManipulatorTracking.Value && Manipulator != null) {
-          if (beforeManipulatorOperator == null) {
-            beforeManipulatorOperator = new BeforeManipulatorOperator<T>();
-            beforeManipulatorOperator.ChildParameter.ActualName = ManipulatorChildParameterName;
-          }
-          if (afterManipulatorOperator == null) {
-            afterManipulatorOperator = new AfterManipulatorOperator<T>();
-            afterManipulatorOperator.ChildParameter.ActualName = ManipulatorChildParameterName;
-          }
-          var instrumentedManipulator = (InstrumentedOperator)Manipulator;
-          instrumentedManipulator.BeforeExecutionOperators.Add(beforeManipulatorOperator);
-          instrumentedManipulator.AfterExecutionOperators.Add(afterManipulatorOperator);
+          if (BeforeManipulatorOperator == null) {
+            BeforeManipulatorOperator = new BeforeManipulatorOperator<T>();
+            BeforeManipulatorOperator.ChildParameter.ActualName = ManipulatorChildParameterName;
+            var instrumentedManipulator = (InstrumentedOperator)Manipulator;
+            instrumentedManipulator.BeforeExecutionOperators.Add(BeforeManipulatorOperator);
+          }
+          if (AfterManipulatorOperator == null) {
+            AfterManipulatorOperator = new AfterManipulatorOperator<T>();
+            AfterManipulatorOperator.ChildParameter.ActualName = ManipulatorChildParameterName;
+            var instrumentedManipulator = (InstrumentedOperator)Manipulator;
+            instrumentedManipulator.AfterExecutionOperators.Add(AfterManipulatorOperator);
+          }
         }
       } else {