Changeset 12030

Timestamp:

02/17/15 21:18:40 (10 years ago)

Author:

bburlacu

Message:

#2326: Added PreBuildEvent.cmd and fixed error.

Location:

branches/SymbolicExpressionTreeDiversityAnalyzers

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationPhenotypicDiversityAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionPhenotypicDiversityAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs (modified) (2 diffs)
• PreBuildEvent.cmd (added)
• SymbolicExpressionTreeDiversityAnalyzers.v12.suo (modified) (previous)

branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationPhenotypicDiversityAnalyzer.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Analyzers {
-  [Item("SymbolicDataAnalysisPhenotypicDiversityAnalyzer", "An analyzer which calculates diversity based on the phenotypic distance between trees")]
+  [Item("SymbolicClassificationPhenotypicDiversityAnalyzer", "An analyzer which calculates diversity based on the phenotypic distance between trees")]
   [StorableClass]
   public class SymbolicClassificationPhenotypicDiversityAnalyzer : SingleObjectivePopulationDiversityAnalyzer {
@@ -105 +105 @@
       if (UseClassValues) {
         var problemData = ProblemDataParameter.ActualValue;
-        var evaluatedValues = new ItemArray<DoubleArray>();
+        var evaluatedValues = new ItemArray<DoubleArray>(trees.Length);
         for (int i = 0; i < trees.Length; ++i) {
           var t = trees[i];

branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs

@@ -24 +24 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.DataAnalysis.Symbolic.Analyzers;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
@@ -115 +116 @@
       Operators.Add(new SymbolicClassificationSingleObjectiveTrainingParetoBestSolutionAnalyzer());
       Operators.Add(new SymbolicClassificationSingleObjectiveValidationParetoBestSolutionAnalyzer());
+      Operators.Add(new SymbolicClassificationPhenotypicDiversityAnalyzer());
       ParameterizeOperators();
     }

branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionPhenotypicDiversityAnalyzer.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Analyzers {
-  [Item("SymbolicDataAnalysisPhenotypicDiversityAnalyzer", "An analyzer which calculates diversity based on the phenotypic distance between trees")]
+  [Item("SymbolicRegressionPhenotypicDiversityAnalyzer", "An analyzer which calculates diversity based on the phenotypic distance between trees")]
   [StorableClass]
   public class SymbolicRegressionPhenotypicDiversityAnalyzer : SingleObjectivePopulationDiversityAnalyzer {

branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

@@ -25 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.DataAnalysis.Symbolic.Analyzers;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
@@ -111 +112 @@
       Operators.Add(new SymbolicRegressionSingleObjectiveValidationParetoBestSolutionAnalyzer());
       Operators.Add(new SymbolicRegressionSolutionsAnalyzer());
+      Operators.Add(new SymbolicRegressionPhenotypicDiversityAnalyzer());
 
       ParameterizeOperators();

branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

@@ -233 +233 @@
       Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
       Operators.Add(new SymbolicDataAnalysisBottomUpDiversityAnalyzer());
-      Operators.Add(new SymbolicDataAnalysisPhenotypicDiversityAnalyzer());
       ParameterizeOperators();
     }
@@ -353 +352 @@
         op.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
       }
-      foreach (var op in operators.OfType<SymbolicDataAnalysisBottomUpDiversityAnalyzer>()) {
-        var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator();
-        similarityCalculator.QualityVariableName = "Quality";
-        similarityCalculator.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
-        op.SimilarityCalculator = similarityCalculator;
-      }
-      foreach (var op in operators.OfType<SymbolicDataAnalysisPhenotypicDiversityAnalyzer>()) {
-        var similarityCalculator = new SymbolicExpressionTreePhenotypicSimilarityCalculator();
-        similarityCalculator.QualityVariableName = "Quality";
-        similarityCalculator.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
-        op.SimilarityCalculator = similarityCalculator;
-      }
     }