Changeset 18146 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeNodeEqualityComparer.cs
- Timestamp:
- 12/16/21 14:23:48 (2 years ago)
- Location:
- branches/3136_Structural_GP
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3136_Structural_GP
- Property svn:mergeinfo changed
-
branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeNodeEqualityComparer.cs
r17180 r18146 33 33 protected SymbolicExpressionTreeNodeEqualityComparer(SymbolicExpressionTreeNodeEqualityComparer original, Cloner cloner) 34 34 : base(original, cloner) { 35 match ConstantValues = original.matchConstantValues;35 matchNumericValues = original.matchNumericValues; 36 36 matchVariableNames = original.matchVariableNames; 37 37 matchVariableWeights = original.matchVariableWeights; … … 41 41 // more flexible matching criteria 42 42 [Storable] 43 private bool match ConstantValues;44 public bool Match ConstantValues {45 get { return match ConstantValues; }46 set { match ConstantValues = value; }43 private bool matchNumericValues; 44 public bool MatchParameterValues { 45 get { return matchNumericValues; } 46 set { matchNumericValues = value; } 47 47 } 48 48 … … 66 66 67 67 public SymbolicExpressionTreeNodeEqualityComparer() { 68 match ConstantValues = true;68 matchNumericValues = true; 69 69 matchVariableNames = true; 70 70 matchVariableWeights = true; … … 86 86 return (!MatchVariableNames || va.VariableName.Equals(vb.VariableName)) && (!MatchVariableWeights || va.Weight.Equals(vb.Weight)); 87 87 } 88 var ca = a as ConstantTreeNode; 89 if ( ca != null) {90 var cb = b as ConstantTreeNode;88 89 if (a is INumericTreeNode ca) { 90 var cb = b as INumericTreeNode; 91 91 if (cb == null) return false; 92 return (!Match ConstantValues || ca.Value.Equals(cb.Value));92 return (!MatchParameterValues || ca.Value.Equals(cb.Value)); 93 93 } 94 94 return false;
Note: See TracChangeset
for help on using the changeset viewer.