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

Timestamp:

01/16/14 16:37:56 (11 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.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators

Files:

• AfterCrossoverOperator.cs (modified) (3 diffs)
• AfterManipulatorOperator.cs (modified) (1 diff)
• AfterSolutionCreatorOperator.cs (modified) (2 diffs)
• BeforeCrossoverOperator.cs (added)
• BeforeManipulatorOperator.cs (modified) (1 diff)
• Interfaces (added)
• Interfaces/ICrossoverOperator.cs (added)
• Interfaces/IManipulatorOperator.cs (added)

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

@@ -20 +20 @@
 #endregion
 
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29 +28 @@
   [StorableClass]
   [Item("AfterCrossoverOperator", "A generic operator that can record genealogical relationships between crossover parents and children.")]
-  public class AfterCrossoverOperator<T> : EvolutionTrackingOperator
-    where T : class,IItem {
+  public class AfterCrossoverOperator<T> : EvolutionTrackingOperator, ICrossoverOperator<T> where T : class,IItem {
     private const string defaultParentsParameterName = "Parents";
     private const string defaultChildParameterName = "Child";
-    public IScopeTreeLookupParameter<T> ParentsParameter;
-    public ILookupParameter<T> ChildParameter;
+    public IScopeTreeLookupParameter<T> ParentsParameter { get; set; }
+    public ILookupParameter<T> ChildParameter { get; set; }
 
     protected AfterCrossoverOperator(AfterCrossoverOperator<T> original, Cloner cloner)
@@ -51 +49 @@
 
     public override IOperation Apply() {
-      //      var parentVertices = ParentsParameter.ActualValue.Select(x => GenealogyGraph[x].Last()).ToList();
-      var lastGen = GenealogyGraph.Ranks[Generations.Value].ToList();
-      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 GenealogyGraphNode<T> {
-        Content = ChildParameter.ActualValue,
-        Rank = parentVertices[0].Rank + 1
-      };
-      GenealogyGraph.AddVertex(childVertex);
-      foreach (var v in parentVertices) {
-        childVertex.AddReverseArc(v);
-        v.AddForwardArc(childVertex);
-      }
-      //      if (parentVertices[0].Content == parentVertices[1].Content)
-      //        throw new Exception("Self-crossover");
       return base.Apply();
     }

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<T> : EvolutionTrackingOperator
-    where T : class,IItem {
+  public class AfterManipulatorOperator<T> : EvolutionTrackingOperator, IManipulatorOperator<T> where T : class,IItem {
 
     private const string ChildParameterName = "Child";
-    public ILookupParameter<T> ChildParameter;
+    public ILookupParameter<T> ChildParameter { get; set; }
 
     protected AfterManipulatorOperator(AfterManipulatorOperator<T> original, Cloner cloner)

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

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -29 +30 @@
     where T : class,IItem {
 
+    private const string CurrentScopeParameterName = "CurrentScope";
+
+    public ScopeParameter CurrentScopeParameter {
+      get { return (ScopeParameter)Parameters[CurrentScopeParameterName]; }
+    }
+    public IScope CurrentScope { get { return CurrentScopeParameter.ActualValue; } }
+
     public override IOperation Apply() {
       return base.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<T> : EvolutionTrackingOperator
-    where T : class,IItem {
+  public class BeforeManipulatorOperator<T> : EvolutionTrackingOperator, IManipulatorOperator<T> where T : class,IItem {
 
     private const string ChildParameterName = "Child";
-    public ILookupParameter<T> ChildParameter;
+    public ILookupParameter<T> ChildParameter { get; set; }
 
     protected BeforeManipulatorOperator(BeforeManipulatorOperator<T> original, Cloner cloner)