Context Navigation

Changeset 12064

Timestamp:

02/23/15 18:15:36 (10 years ago)

Author:

mkommend

Message:

#2326: Fixed namespaces, cloning and serialization in diversity analyzer.

Location:

branches/SymbolicExpressionTreeDiversityAnalyzers

Files:

-                      r12049
+                      r12064
     #region properties
     private bool UseClassValues {
+    public bool UseClassValues {
       get { return UseClassValuesParameter.Value.Value; }
       set { UseClassValuesParameter.Value.Value = value; }
 …
     public SymbolicClassificationPhenotypicDiversityAnalyzer() {
       SimilarityCalculator = new SymbolicExpressionTreePhenotypicSimilarityCalculator { SolutionVariableName = "SymbolicExpressionTree", QualityVariableName = "Quality" };
+      SimilarityCalculator = new SymbolicExpressionTreePhenotypicSimilarityCalculator() { SolutionVariableName = "SymbolicExpressionTree", QualityVariableName = "Quality" };
       #region add parameters
       Parameters.Add(new ScopeTreeLookupParameter<ISymbolicExpressionTree>(SymbolicExpressionTreeParameterName, "The symbolic expression trees."));

r12012	r12064
29	29	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
30	30
31		namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification~~.SingleObjective~~ {
	31	namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
32	32	[Item("Bounded Mean squared error Evaluator", "Calculates the bounded mean squared error of a symbolic classification solution (estimations above or below the class values are only penaltilized linearly.")]
33	33	[StorableClass]

r12029	r12064
25	25	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
26	26
27		namespace HeuristicLab.Problems.DataAnalysis.Symbolic~~.Analyzers~~ {
	27	namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
28	28	[Item("SymbolicDataAnalysisBottomUpDiversityAnalyzer", "A diversity analyzer based on the bottom-up distance between trees.")]
29	29	[StorableClass]

r12028	r12064
34	34	using HeuristicLab.PluginInfrastructure;
35	35
36		namespace HeuristicLab.Problems.DataAnalysis.Symbolic~~.Creators~~ {
	36	namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
37	37	public class MultiSymbolicDataAnalysisExpressionCreator : StochasticMultiBranch<ISymbolicDataAnalysisSolutionCreator>,
38	38	ISymbolicDataAnalysisSolutionCreator,

r12049	r12064
32	32	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
33	33	using HeuristicLab.PluginInfrastructure;
34		~~using HeuristicLab.Problems.DataAnalysis.Symbolic.Analyzers;~~
35	34	using HeuristicLab.Problems.Instances;
36	35

-                      r12055
+                      r12064
   [StorableClass]
   public class SymbolicExpressionTreePhenotypicSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
+    [Storable]
     public IDataAnalysisProblemData ProblemData { get; set; }
+    [Storable]
     public ISymbolicDataAnalysisExpressionTreeInterpreter Interpreter { get; set; }
 …
     public SymbolicExpressionTreePhenotypicSimilarityCalculator(SymbolicExpressionTreePhenotypicSimilarityCalculator original, Cloner cloner)
       : base(original, cloner) {
       this.ProblemData = original.ProblemData;
       this.Interpreter = original.Interpreter;
+      this.ProblemData = cloner.Clone(original.ProblemData);
+      this.Interpreter = cloner.Clone(original.Interpreter);
+    }
 …
+    }
+    public SymbolicExpressionTreePhenotypicSimilarityCalculator() { }
+    public SymbolicExpressionTreePhenotypicSimilarityCalculator() {
+    }
     public double CalculateSimilarity(ISymbolicExpressionTree t1, ISymbolicExpressionTree t2) {

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