Changeset 7303 for branches/gp-crossover

Timestamp:

01/10/12 15:23:39 (13 years ago)

Author:

bburlacu

Message:

#1682: Override of the CanChangeName property, added friendly names for the crossover operators.

Location:

branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers

Files:

• MultiSymbolicDataAnalysisExpressionCrossover.cs (modified) (3 diffs)
• SymbolicDataAnalysisExpressionContextAwareCrossover.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionCrossover.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionDepthConstrainedCrossover.cs (modified) (3 diffs)
• SymbolicDataAnalysisExpressionDeterministicBestCrossover.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionProbabilisticFunctionalCrossover.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionSemanticSimilarityCrossover.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionSizefairCrossover.cs (modified) (1 diff)

branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/MultiSymbolicDataAnalysisExpressionCrossover.cs

@@ -37 +37 @@
   public class MultiSymbolicDataAnalysisExpressionCrossover<T> : StochasticMultiBranch<ISymbolicDataAnalysisExpressionCrossover<T>>,
     ISymbolicDataAnalysisExpressionCrossover<T>,
-    ISymbolicExpressionTreeSizeConstraintOperator, 
-    ISymbolicExpressionTreeGrammarBasedOperator where T: class, IDataAnalysisProblemData {
+    ISymbolicExpressionTreeSizeConstraintOperator,
+    ISymbolicExpressionTreeGrammarBasedOperator where T : class, IDataAnalysisProblemData {
     private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength";
     private const string MaximumSymbolicExpressionTreeDepthParameterName = "MaximumSymbolicExpressionTreeDepth";
@@ -49 +49 @@
 
     public override bool CanChangeName {
-      get { return false; }
+      get { return true; }
     }
     protected override bool CreateChildOperation {
@@ -97 +97 @@
       Parameters.Add(new LookupParameter<ISymbolicExpressionTree>(ChildParameterName, "The child symbolic expression tree resulting from the crossover."));
 
-      var list = new List<ISymbolicDataAnalysisExpressionCrossover<T>>();
-      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(ISymbolicDataAnalysisExpressionCrossover<T>))) {
-        if (this.GetType().Assembly != type.Assembly) continue;
-        if (typeof(IMultiOperator<ISymbolicDataAnalysisExpressionCrossover<T>>).IsAssignableFrom(type))  
-          continue;
-        list.Add((ISymbolicDataAnalysisExpressionCrossover<T>)Activator.CreateInstance(type));
-      }
+      var list = (from type in ApplicationManager.Manager.GetTypes(typeof(ISymbolicDataAnalysisExpressionCrossover<T>))
+                  where this.GetType().Assembly == type.Assembly
+                  where !typeof(IMultiOperator<ISymbolicDataAnalysisExpressionCrossover<T>>).IsAssignableFrom(type)
+                  select (ISymbolicDataAnalysisExpressionCrossover<T>)Activator.CreateInstance(type)).ToList();
+
       var checkedItemList = new CheckedItemList<ISymbolicDataAnalysisExpressionCrossover<T>>();
       checkedItemList.AddRange(list.OrderBy(op => op.Name));
       Operators = checkedItemList.AsReadOnly();
       Operators_ItemsAdded(this, new CollectionItemsChangedEventArgs<IndexedItem<ISymbolicDataAnalysisExpressionCrossover<T>>>(Operators.CheckedItems));
-
+      Name = "MultiCrossover";
     }
 

branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionContextAwareCrossover.cs

@@ -39 +39 @@
     public SymbolicDataAnalysisExpressionContextAwareCrossover()
       : base() {
+      Name = "ContextAwareCrossover";
     }
     public override IDeepCloneable Clone(Cloner cloner) {

branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionCrossover.cs

@@ -43 +43 @@
     private const string MaximumSymbolicExpressionTreeDepthParameterName = "MaximumSymbolicExpressionTreeDepth";
 
-    public override bool CanChangeName { get { return false; } }
+    public override bool CanChangeName { get { return true; } }
 
     #region Parameter properties

branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionDepthConstrainedCrossover.cs

@@ -60 +60 @@
       DepthRangeParameter.ValidValues.Add(new StringValue(Enum.GetName(typeof(Ranges), Ranges.Standard)));
       DepthRangeParameter.ValidValues.Add(new StringValue(Enum.GetName(typeof(Ranges), Ranges.Lowlevel)));
+      Name = "DepthConstrainedCrossover";
     }
     public override IDeepCloneable Clone(Cloner cloner) { return new SymbolicDataAnalysisExpressionDepthConstrainedCrossover<T>(this, cloner); }
@@ -88 +89 @@
       int depth = parent0.Root.GetDepth();
       var depthRange = new DoubleRange();
+      const int depthOffset = 2; // skip the first 2 levels (root + startNode)
       switch ((int)Enum.Parse(typeof(Ranges), mode)) {
         case (int)Ranges.HighLevel:
-          depthRange.Start = 0;
-          depthRange.End = Math.Round(depth * 0.25);
+          depthRange.Start = depthOffset; // skip the first 2 levels (root + startNode)
+          depthRange.End = depthRange.Start + Math.Round(depth * 0.25);
           break;
         case (int)Ranges.Standard:
-          depthRange.Start = Math.Round(depth * 0.25);
-          depthRange.End = Math.Round(depth * 0.75);
+          depthRange.Start = depthOffset + Math.Round(depth * 0.25);
+          depthRange.End = depthRange.Start + Math.Round(depth * 0.5);
           break;
         case (int)Ranges.Lowlevel:
-          depthRange.Start = Math.Round(depth * 0.75);
-          depthRange.End = depth;
+          depthRange.Start = depthOffset + Math.Round(depth * 0.75);
+          depthRange.End = Math.Max(depthRange.Start, depth);
           break;
       }
@@ -110 +112 @@
                                     select new CutPoint(n, s));
       });
+
+      if (crossoverPoints0.Count == 0)
+        throw new Exception("No crossover points available in the first parent");
+
       CutPoint crossoverPoint0 = crossoverPoints0.SelectRandom(random);
       int level = parent0.Root.GetBranchLevel(crossoverPoint0.Child);

branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionDeterministicBestCrossover.cs

@@ -39 +39 @@
     public SymbolicDataAnalysisExpressionDeterministicBestCrossover()
       : base() {
+      Name = "DeterministicBestCrossover";
     }
     public override IDeepCloneable Clone(Cloner cloner) {

branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionProbabilisticFunctionalCrossover.cs

@@ -36 +36 @@
     private SymbolicDataAnalysisExpressionProbabilisticFunctionalCrossover(SymbolicDataAnalysisExpressionCrossover<T> original, Cloner cloner)
       : base(original, cloner) { }
-    public SymbolicDataAnalysisExpressionProbabilisticFunctionalCrossover() : base() { }
+    public SymbolicDataAnalysisExpressionProbabilisticFunctionalCrossover()
+      : base() {
+      Name = "ProbabilisticFunctionalCrossover";
+    }
     public override IDeepCloneable Clone(Cloner cloner) { return new SymbolicDataAnalysisExpressionProbabilisticFunctionalCrossover<T>(this, cloner); }
 

branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionSemanticSimilarityCrossover.cs

@@ -53 +53 @@
       : base() {
       Parameters.Add(new ValueLookupParameter<DoubleRange>(SemanticSimilarityRangeParameterName, "Semantic similarity interval.", new DoubleRange(0.0001, 10)));
+      Name = "SemanticSimilarityCrossover";
     }
     public override IDeepCloneable Clone(Cloner cloner) { return new SymbolicDataAnalysisExpressionSemanticSimilarityCrossover<T>(this, cloner); }

branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionSizefairCrossover.cs

@@ -12 +12 @@
     public override IDeepCloneable Clone(Cloner cloner) { return new SymbolicDataAnalysisExpressionSizefairCrossover<T>(this, cloner); }
 
+    public override bool CanChangeName {
+      get { return true; }
+    }
+
     public SymbolicDataAnalysisExpressionSizefairCrossover()
       : base() {
       SymbolicDataAnalysisEvaluationPartitionParameter.Hidden = true;
+      Name = "SizeFairCrossover";
     }
   }