Changeset 11950


Ignore:
Timestamp:
02/06/15 14:51:43 (6 years ago)
Author:
bburlacu
Message:

#2310: Removed flags for relaxed matching.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs

    r11921 r11950  
    3636  public class SymbolicExpressionTreeBottomUpSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
    3737    private readonly HashSet<string> commutativeSymbols = new HashSet<string> { "Addition", "Multiplication", "Average", "And", "Or", "Xor" };
    38     public bool MatchVariableWeights { get; set; }
    39     public bool MatchConstantValues { get; set; }
    40 
    4138    public SymbolicExpressionTreeBottomUpSimilarityCalculator() { }
    4239
     
    4845    protected SymbolicExpressionTreeBottomUpSimilarityCalculator(SymbolicExpressionTreeBottomUpSimilarityCalculator original, Cloner cloner)
    4946      : base(original, cloner) {
    50       MatchVariableWeights = original.MatchVariableWeights;
    51       MatchConstantValues = original.MatchConstantValues;
    5247    }
    5348
     
    220215      var constant = node as ConstantTreeNode;
    221216      if (constant != null)
    222         return MatchConstantValues ? constant.Value.ToString(CultureInfo.InvariantCulture) : constant.Symbol.Name;
     217        return constant.Value.ToString(CultureInfo.InvariantCulture);
     218
    223219      var variable = node as VariableTreeNode;
    224       if (variable != null) {
    225         return MatchVariableWeights ? variable.Weight + variable.VariableName : variable.VariableName;
    226       }
     220      if (variable != null)
     221        return variable.Weight + variable.VariableName;
    227222
    228223      return node.ToString();
Note: See TracChangeset for help on using the changeset viewer.