Changeset 11965

Timestamp:

02/06/15 19:01:26 (9 years ago)

Author:

bburlacu

Message:

#1772: Merged trunk changes and updated the SymbolicDataAnalysisBottomUpDiversityAnalyzer.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/EmptySymbolicExpressionTreeGrammar.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs (modified) (4 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs

@@ -109 +109 @@
         return parent0;
       } else {
-        var selectedBranch = SelectRandomBranch(random, allowedBranches, internalCrossoverPointProbability);
+        var selectedBranch = (ISymbolicExpressionTreeNode)SelectRandomBranch(random, allowedBranches, internalCrossoverPointProbability).Clone();
 
         if (crossoverPoint0.Child != null) {

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/EmptySymbolicExpressionTreeGrammar.cs

@@ -136 +136 @@
     }
     
-    #pragma warning disable 0169 //disable usage warning
+    #pragma warning disable 0067 //disable usage warning
     public event EventHandler Changed;
-    #pragma warning restore 0169
+    #pragma warning restore 0067
     #endregion
   }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs

@@ -22 +22 @@
 using HeuristicLab.Analysis;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -30 +28 @@
   [StorableClass]
   public class SymbolicDataAnalysisBottomUpDiversityAnalyzer : SingleObjectivePopulationDiversityAnalyzer {
-    private const string MatchConstantValuesParameterName = "MatchConstantValues";
-    private const string MatchVariableWeightsParameterName = "MatchVariableWeights";
-
-    public IValueParameter<BoolValue> MatchVariableWeightsParameter {
-      get { return (IValueParameter<BoolValue>)Parameters[MatchVariableWeightsParameterName]; }
-    }
-
-    public IValueParameter<BoolValue> MatchConstantValuesParameter {
-      get { return (IValueParameter<BoolValue>)Parameters[MatchConstantValuesParameterName]; }
-    }
-
-    public bool MatchConstantValues {
-      get { return MatchConstantValuesParameter.Value.Value; }
-      set {
-        MatchConstantValuesParameter.Value.Value = value;
-        ((SymbolicExpressionTreeBottomUpSimilarityCalculator)SimilarityCalculator).MatchConstantValues = value;
-      }
-    }
-
-    public bool MatchVariableWeights {
-      get { return MatchVariableWeightsParameter.Value.Value; }
-      set {
-        MatchVariableWeightsParameter.Value.Value = value;
-        ((SymbolicExpressionTreeBottomUpSimilarityCalculator)SimilarityCalculator).MatchVariableWeights = value;
-      }
-    }
-
     [StorableConstructor]
     protected SymbolicDataAnalysisBottomUpDiversityAnalyzer(bool deserializing) : base(deserializing) { }
@@ -62 +33 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      if (!Parameters.ContainsKey(MatchConstantValuesParameterName))
-        Parameters.Add(new ValueParameter<BoolValue>(MatchConstantValuesParameterName, "Specifies if the similarity calculator should match constant values.", new BoolValue(true)));
-      if (!Parameters.ContainsKey(MatchVariableWeightsParameterName))
-        Parameters.Add(new ValueParameter<BoolValue>(MatchVariableWeightsParameterName, "Specifies if the similarity calculator should match variable weights", new BoolValue(true)));
     }
 
     public SymbolicDataAnalysisBottomUpDiversityAnalyzer() {
       SimilarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { SolutionVariableName = "SymbolicExpressionTree" };
-      Parameters.Add(new ValueParameter<BoolValue>(MatchConstantValuesParameterName, "Specifies if the similarity calculator should match constant values.", new BoolValue(true)));
-      Parameters.Add(new ValueParameter<BoolValue>(MatchVariableWeightsParameterName, "Specifies if the similarity calculator should match variable weights", new BoolValue(true)));
     }
   }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs

@@ -36 +36 @@
   public class SymbolicExpressionTreeBottomUpSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator, ISymbolicDataAnalysisExpressionSimilarityCalculator {
     private readonly HashSet<string> commutativeSymbols = new HashSet<string> { "Addition", "Multiplication", "Average", "And", "Or", "Xor" };
-    public bool MatchVariableWeights { get; set; }
-    public bool MatchConstantValues { get; set; }
-
     public SymbolicExpressionTreeBottomUpSimilarityCalculator() { }
 
@@ -48 +45 @@
     protected SymbolicExpressionTreeBottomUpSimilarityCalculator(SymbolicExpressionTreeBottomUpSimilarityCalculator original, Cloner cloner)
       : base(original, cloner) {
-      MatchVariableWeights = original.MatchVariableWeights;
-      MatchConstantValues = original.MatchConstantValues;
     }
 
@@ -214 +209 @@
     }
 
-    private string Label(ISymbolicExpressionTreeNode node) {
+    private static string Label(ISymbolicExpressionTreeNode node) {
       if (node.SubtreeCount > 0)
         return node.Symbol.Name;
@@ -220 +215 @@
       var constant = node as ConstantTreeNode;
       if (constant != null)
-        return MatchConstantValues ? constant.Value.ToString(CultureInfo.InvariantCulture) : constant.Symbol.Name;
+        return constant.Value.ToString(CultureInfo.InvariantCulture);
+
       var variable = node as VariableTreeNode;
-      if (variable != null) {
-        return MatchVariableWeights ? variable.Weight + variable.VariableName : variable.VariableName;
-      }
+      if (variable != null)
+        return variable.Weight + variable.VariableName;
 
       return node.ToString();