Changeset 12951 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Wildcards

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.Problems.DataAnalysis.Symbolic/3.4/Symbols/Wildcards

Files:

• AnyNode.cs (modified) (1 diff)
• AnyNodeSymbol.cs (modified) (1 diff)
• AnySubtree.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Wildcards/AnyNode.cs

@@ -27 +27 @@
   [StorableClass]
   public class AnyNode : SymbolicExpressionTreeNode {
+    [StorableConstructor]
     protected AnyNode(bool deserializing) : base(deserializing) { }
 
     protected AnyNode(AnyNode original, Cloner cloner) : base(original, cloner) { }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new AnyNode(this, cloner);
+    }
+
     public AnyNode(AnyNodeSymbol symbol) : base(symbol) { }
   }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Wildcards/AnyNodeSymbol.cs

@@ -45 +45 @@
     public AnyNodeSymbol(int minimumArity, int maximumArity)
       : base("=", "A wildcard symbol that can match any node of the same type (function or leaf node)") {
-      MinimumArity = minimumArity;
-      MaximumArity = maximumArity;
+      this.MinimumArity = minimumArity;
+      this.MaximumArity = maximumArity;
     }
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Wildcards/AnySubtree.cs

@@ -27 +27 @@
   [StorableClass]
   public class AnySubtree : SymbolicExpressionTreeNode {
+    [StorableConstructor]
     protected AnySubtree(bool deserializing) : base(deserializing) {
     }
@@ -33 +34 @@
     }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new AnySubtree(this, cloner);
+    }
+
     public AnySubtree(AnySubtreeSymbol symbol) : base(symbol) {
     }