Changeset 10464

Timestamp:

02/19/14 10:42:43 (11 years ago)

Author:

bburlacu

Message:

#1772: Maintenance commit, removed some misplaced files, updated license header.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicDataAnalysisGenealogyView.Designer.cs (deleted)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymbolicDataAnalysisGenealogyView.cs (deleted)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisPopulationDiversityAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowQualitiesAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionPruningOperator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeSimilarityCalculator.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

@@ -219 +219 @@
       <DependentUpon>SlidingWindowDataView.cs</DependentUpon>
     </Compile>
-    <Compile Include="SymbolicDataAnalysisGenealogyGraphView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
     <Compile Include="TextualSymbolicDataAnalysisModelView.cs">
       <SubType>UserControl</SubType>

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

@@ -159 +159 @@
         SimilarityParameter.ActualValue = new DoubleValue();
 
-        var comp = new SymbolicExpressionTreeNodeSimilarityComparer {
+        var comparer = new SymbolicExpressionTreeNodeSimilarityComparer {
           MatchConstantValues = MatchConstantValuesParameter.Value.Value,
           MatchVariableNames = MatchVariableNamesParameter.Value.Value,
@@ -169 +169 @@
           var op = new SymbolicDataAnalysisExpressionTreeSimilarityCalculator {
             CurrentSymbolicExpressionTree = tree,
-            SimilarityComparer = comp,
+            SimilarityComparer = comparer,
             MaximumTreeDepth = MaximumSymbolicExpressionTreeDepth.Value
           };

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -189 +189 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SymbolicDataAnalysisExpressionPruningOperator.cs" />
     <Compile Include="SlidingWindow\GenerationalSlidingWindowAnalyzer.cs" />
     <Compile Include="SlidingWindow\OffspringSelectionSlidingWindowAnalyzer.cs" />
@@ -198 +197 @@
     <Compile Include="SymbolGraph\FPGraph.cs" />
     <Compile Include="SymbolGraph\SymbolGraph.cs" />
+    <Compile Include="SymbolicDataAnalysisExpressionPruningOperator.cs" />
     <Compile Include="SymbolicDataAnalysisExpressionTreeMatching.cs" />
     <Compile Include="SymbolicDataAnalysisExpressionTreeSimilarityCalculator.cs" />

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowQualitiesAnalyzer.cs

@@ -92 +92 @@
 
       var problemData = (IRegressionProblemData)ProblemDataParameter.ActualValue;
-      var evaluator =
-        (SymbolicDataAnalysisSingleObjectiveEvaluator<IRegressionProblemData>)EvaluatorParameter.ActualValue;
+      var evaluator = (SymbolicDataAnalysisSingleObjectiveEvaluator<IRegressionProblemData>)EvaluatorParameter.ActualValue;
       var context = new Core.ExecutionContext(ExecutionContext, evaluator, new Scope());
       var fitnessCalculationPartition = FitnessCalculationPartitionParameter.ActualValue;

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionPruningOperator.cs

@@ -142 +142 @@
 
         quality -= impactValue;
+
         prunedSubtrees++;
       }
-
-      //      Quality.Value = quality; // update quality according to what has been pruned
 
       if (prunedSubtrees > 0) prunedTrees = 1;
@@ -160 +159 @@
     }
     protected abstract ISymbolicDataAnalysisModel CreateModel();
-    protected abstract double Evaluate();
     protected abstract double Evaluate(IDataAnalysisModel model);
   }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeSimilarityCalculator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -42 +42 @@
       get { return (IScopeTreeLookupParameter<ISymbolicExpressionTree>)Parameters[SymbolicExpressionTreeParameterName]; }
     }
-
     public IValueParameter<ISymbolicExpressionTree> CurrentSymbolicExpressionTreeParameter {
       get { return (IValueParameter<ISymbolicExpressionTree>)Parameters[CurrentSymbolicExpressionTreeParameterName]; }
     }
-
     public ILookupParameter<BoolValue> MatchVariableNamesParameter {
       get { return (ILookupParameter<BoolValue>)Parameters[MatchVariablesParameterName]; }
     }
-
     public ILookupParameter<BoolValue> MatchVariableWeightsParameter {
       get { return (ILookupParameter<BoolValue>)Parameters[MatchVariableWeightsParameterName]; }
     }
-
     public ILookupParameter<BoolValue> MatchConstantValuesParameter {
       get { return (ILookupParameter<BoolValue>)Parameters[MatchConstantValuesParameterName]; }
     }
-
     public ILookupParameter<DoubleValue> SimilarityParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters[SimilarityValuesParmeterName]; }
     }
-
     public ISymbolicExpressionTree CurrentSymbolicExpressionTree {
       get { return CurrentSymbolicExpressionTreeParameter.Value; }
       set { CurrentSymbolicExpressionTreeParameter.Value = value; }
     }
-
     public SymbolicExpressionTreeNodeSimilarityComparer SimilarityComparer { get; set; }