Changeset 10285 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/AfterCrossoverOperator.cs

Timestamp:

01/05/14 20:47:50 (10 years ago)

Author:

bburlacu

Message:

#1772: Added SymbolicDataAnalysisGenealogyView, updated generic analyzer and operators.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/AfterCrossoverOperator.cs (modified) (3 diffs)

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

@@ -33 +33 @@
     where TVertex : class,IGenealogyGraphNode<TContent>, new()
     where TContent : class,IItem {
-
-    private string parentsParameterName;
-    public string ParentsParameterName {
-      get { return parentsParameterName; }
-      set {
-        if (parentsParameterName != null && Parameters.ContainsKey(parentsParameterName)) Parameters.Remove(parentsParameterName); // remove old parameter
-        parentsParameterName = value;
-        if (!Parameters.ContainsKey(parentsParameterName)) Parameters.Add(new ScopeTreeLookupParameter<TContent>(parentsParameterName));
-      }
-    }
-    private string childParameterName;
-    public string ChildParameterName {
-      get { return childParameterName; }
-      set {
-        if (childParameterName != null && Parameters.ContainsKey(childParameterName)) Parameters.Remove(childParameterName);
-        childParameterName = value;
-        if (!Parameters.ContainsKey(childParameterName)) Parameters.Add(new LookupParameter<TContent>(childParameterName));
-      }
-    }
-
-    public IScopeTreeLookupParameter<TContent> ParentsParameter {
-      get { return (IScopeTreeLookupParameter<TContent>)Parameters[ParentsParameterName]; }
-    }
-
-    public ILookupParameter<TContent> ChildParameter {
-      get { return (ILookupParameter<TContent>)Parameters[ChildParameterName]; }
-    }
+    private const string defaultParentsParameterName = "Parents";
+    private const string defaultChildParameterName = "Child";
+    public IScopeTreeLookupParameter<TContent> ParentsParameter;
+    public ILookupParameter<TContent> ChildParameter;
 
     protected AfterCrossoverOperator(AfterCrossoverOperator<TGraph, TVertex, TContent> original, Cloner cloner)
       : base(original, cloner) {
-      ParentsParameterName = original.ParentsParameterName;
-      ChildParameterName = original.ChildParameterName;
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -70 +45 @@
     }
 
-    public AfterCrossoverOperator() { }
+    public AfterCrossoverOperator() {
+      ParentsParameter = new ScopeTreeLookupParameter<TContent>(defaultParentsParameterName);
+      ChildParameter = new LookupParameter<TContent>(defaultChildParameterName);
+      Parameters.Add(ParentsParameter);
+      Parameters.Add(ChildParameter);
+    }
 
     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();
+      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 {
         Content = ChildParameter.ActualValue,
@@ -85 +66 @@
         v.AddForwardArc(childVertex);
       }
+      //      if (parentVertices[0].Content == parentVertices[1].Content)
+      //        throw new Exception("Self-crossover");
       return base.Apply();
     }