Context Navigation

Changeset 18148

Timestamp:

12/16/21 14:54:09 (3 years ago)

Author:

chaider

Message:

#3140 merged branch into trunk

Location:

trunk

Files:

trunk
- Property svn:mergeinfo changed
  /branches/3140_NumberSymbol merged: 18144-18145,18147
trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
  /branches/3140_NumberSymbol/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding merged: 18145

r18132	r18148
6	6	[StorableType("c4de8ab2-616d-4c73-9f9c-59545ac38199")]
7	7	public interface ISymbolicExpressionTreeNodeSimilarityComparer : IEqualityComparer<ISymbolicExpressionTreeNode>, IItem {
8		bool Match~~Parameter~~Values { get; set; }
	8	bool MatchNumericValues { get; set; }
9	9	bool MatchVariableWeights { get; set; }
10	10	bool MatchVariableNames { get; set; }

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
  /branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic merged: 18144-18145,18147

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" />

r18132	r18148
35	35	public override int MaximumArity => maximumArity;
36	36
	37	[Storable]
37	38	public double Value { get; set; }
38	39

-                      r18132
+                      r18148
     public NumberTreeNode(Number numberSymbol) : base(numberSymbol) { }
+    public NumberTreeNode(double value) : this(new Number()) {
+      Value = value;
+    }
     public override bool HasLocalParameters => true;

-                      r18132
+                      r18148
     public bool MatchParameterValues {
       get { return comparer.MatchParameterValues; }
       set { comparer.MatchParameterValues = value; }
+      get { return comparer.MatchNumericValues; }
+      set { comparer.MatchNumericValues = value; }
+    }
 …
     public SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator() {
       comparer = new SymbolicExpressionTreeNodeEqualityComparer {
         MatchParameterValues = true,
+        MatchNumericValues = true,
         MatchVariableNames = true,
         MatchVariableWeights = true
 …
     public SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator(bool matchVariableWeights, bool matchParameterValues) {
       comparer = new SymbolicExpressionTreeNodeEqualityComparer {
         MatchParameterValues = matchParameterValues,
+        MatchNumericValues = matchParameterValues,
         MatchVariableNames = true,
         MatchVariableWeights = matchVariableWeights

-                      r18141
+                      r18148
     [Storable]
     private bool matchNumericValues;
     public bool MatchParameterValues {
+    public bool MatchNumericValues {
       get { return matchNumericValues; }
       set { matchNumericValues = value; }
 …
         var cb = b as INumericTreeNode;
         if (cb == null) return false;
         return (!MatchParameterValues || ca.Value.Equals(cb.Value));
+        return (!MatchNumericValues || ca.Value.Equals(cb.Value));
+      }
       return false;

trunk/HeuristicLab.Tests
- Property svn:mergeinfo changed
  /branches/3140_NumberSymbol/HeuristicLab.Tests merged: 18145,18147

-                      r18132
+                      r18148
       var formatter = new SymbolicExpressionTreeStringFormatter();
       var importer = new SymbolicExpressionImporter();
+      var actualTree = TreeSimplifier.Simplify(importer.Import(original));
+      var originalTree = importer.Import(original);
+      originalTree = ConstantsToNumberConverter.Convert(originalTree);
+      var actualTree = TreeSimplifier.Simplify(originalTree);
       var expectedTree = importer.Import(expected);
       Assert.AreEqual(formatter.Format(expectedTree), formatter.Format(actualTree));

-                      r18132
+                      r18148
       var sw = new Stopwatch();
       var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchVariableWeights = false, MatchParameterValues = false };
+      var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchVariableWeights = false, MatchNumericValues = false };
       sw.Start();
 …
       var trees = Util.CreateRandomTrees(twister, ds, grammar, N, 100);
       var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchParameterValues = strict, MatchVariableWeights = strict };
+      var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchNumericValues = strict, MatchVariableWeights = strict };
       var bottomUpSimilarity = 0d;
       for (int i = 0; i < trees.Length - 1; ++i) {

Note: See TracChangeset for help on using the changeset viewer.