Changeset 9249 for branches/HeuristicLab.EvolutionaryTracking

Timestamp:

02/27/13 13:24:59 (11 years ago)

Author:

bburlacu

Message:

#1772: Updated matching criteria to BoolValues in SymbolicDataAnalysisExpressionTreeMatching.cs.

File:

• branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeMatching.cs (modified) (3 diffs)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeMatching.cs

@@ -4 +4 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -24 +25 @@
     // more flexible matching criteria 
     [Storable]
-    private bool matchConstantValues;
+    private BoolValue matchConstantValues;
     public bool MatchConstantValues {
-      get { return matchConstantValues; }
-      set { matchConstantValues = value; }
+      get { return matchConstantValues.Value; }
+      set { matchConstantValues.Value = value; }
     }
 
     [Storable]
-    private bool matchVariableNames;
+    private BoolValue matchVariableNames;
     public bool MatchVariableNames {
-      get { return matchVariableNames; }
-      set { matchVariableNames = value; }
+      get { return matchVariableNames.Value; }
+      set { matchVariableNames.Value = value; }
     }
 
     [Storable]
-    private bool matchVariableWeights;
+    private BoolValue matchVariableWeights;
     public bool MatchVariableWeights {
-      get { return matchVariableWeights; }
-      set { matchVariableWeights = value; }
+      get { return matchVariableWeights.Value; }
+      set { matchVariableWeights.Value = value; }
     }
 
@@ -49 +50 @@
 
     public SymbolicExpressionTreeNodeSimilarityComparer() {
-      matchConstantValues = true;
-      matchVariableNames = true;
-      matchVariableWeights = true;
+      matchConstantValues = new BoolValue(true);
+      matchVariableNames = new BoolValue(true);
+      matchVariableWeights = new BoolValue(true);
     }