Changeset 18148 for trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4
- Timestamp:
- 12/16/21 14:54:09 (3 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/3140_NumberSymbol merged: 18144-18145,18147
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
/branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic merged: 18144-18145,18147
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj
r18132 r18148 153 153 <SubType>Code</SubType> 154 154 </Compile> 155 <Compile Include="Converters\ConstantsToNumberConverter.cs" /> 155 156 <Compile Include="Converters\LinearModelToTreeConverter.cs" /> 156 157 <Compile Include="Converters\TreeSimplifier.cs" /> -
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Constant.cs
r18132 r18148 35 35 public override int MaximumArity => maximumArity; 36 36 37 [Storable] 37 38 public double Value { get; set; } 38 39 -
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/NumberTreeNode.cs
r18132 r18148 44 44 public NumberTreeNode(Number numberSymbol) : base(numberSymbol) { } 45 45 46 public NumberTreeNode(double value) : this(new Number()) { 47 Value = value; 48 } 49 46 50 public override bool HasLocalParameters => true; 47 51 -
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator.cs
r18132 r18148 39 39 40 40 public bool MatchParameterValues { 41 get { return comparer.Match ParameterValues; }42 set { comparer.Match ParameterValues = value; }41 get { return comparer.MatchNumericValues; } 42 set { comparer.MatchNumericValues = value; } 43 43 } 44 44 … … 59 59 public SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator() { 60 60 comparer = new SymbolicExpressionTreeNodeEqualityComparer { 61 Match ParameterValues = true,61 MatchNumericValues = true, 62 62 MatchVariableNames = true, 63 63 MatchVariableWeights = true … … 67 67 public SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator(bool matchVariableWeights, bool matchParameterValues) { 68 68 comparer = new SymbolicExpressionTreeNodeEqualityComparer { 69 Match ParameterValues = matchParameterValues,69 MatchNumericValues = matchParameterValues, 70 70 MatchVariableNames = true, 71 71 MatchVariableWeights = matchVariableWeights -
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeNodeEqualityComparer.cs
r18141 r18148 42 42 [Storable] 43 43 private bool matchNumericValues; 44 public bool Match ParameterValues {44 public bool MatchNumericValues { 45 45 get { return matchNumericValues; } 46 46 set { matchNumericValues = value; } … … 90 90 var cb = b as INumericTreeNode; 91 91 if (cb == null) return false; 92 return (!Match ParameterValues || ca.Value.Equals(cb.Value));92 return (!MatchNumericValues || ca.Value.Equals(cb.Value)); 93 93 } 94 94 return false;
Note: See TracChangeset
for help on using the changeset viewer.