Changeset 11910 for branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs

Timestamp:

02/05/15 12:09:18 (9 years ago)

Author:

bburlacu

Message:

#2215:

• Unified the similarity and matching/equality classes under the same folder.
• Renamed SymbolicExpressionTreeNodeSimilarityComparer to SymbolicExpressionTreeNodeEqualityComparer, renamed other classes to more descriptive names.
• Removed unused classes (SymbolicDataAnalysisInternalDiversityAnalyzer.cs, SymbolicExpressionTreeMaxCommonSequenceCalculator.cs
• Renamed tests and test files.

Location:

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching

Files:

• . (moved) (moved from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Matching)
• SymbolicExpressionTreeBottomUpSimilarityCalculator.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SimilarityCalculators/BottomUpSimilarityCalculator.cs) (2 diffs)

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs

@@ -33 +33 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
-  [Item("BottomUpSimilarityCalculator", "A similarity calculator which uses the tree bottom-up distance as a similarity metric.")]
-  public class BottomUpSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
+  [Item("SymbolicExpressionTreeBottomUpSimilarityCalculator", "A similarity calculator which uses the tree bottom-up distance as a similarity metric.")]
+  public class SymbolicExpressionTreeBottomUpSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
     private readonly HashSet<string> commutativeSymbols = new HashSet<string> { "Addition", "Multiplication", "Average", "And", "Or", "Xor" };
     public bool MatchVariableWeights { get; set; }
     public bool MatchConstantValues { get; set; }
 
-    public BottomUpSimilarityCalculator() { }
-
-    protected BottomUpSimilarityCalculator(BottomUpSimilarityCalculator original, Cloner cloner)
+    public SymbolicExpressionTreeBottomUpSimilarityCalculator() { }
+
+    protected SymbolicExpressionTreeBottomUpSimilarityCalculator(SymbolicExpressionTreeBottomUpSimilarityCalculator original, Cloner cloner)
       : base(original, cloner) {
       MatchVariableWeights = original.MatchVariableWeights;
@@ -48 +48 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new BottomUpSimilarityCalculator(this, cloner);
+      return new SymbolicExpressionTreeBottomUpSimilarityCalculator(this, cloner);
     }