- Timestamp:
- 02/19/14 10:42:43 (11 years ago)
- Location:
- branches/HeuristicLab.EvolutionTracking
- Files:
-
- 2 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Property svn:mergeinfo changed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj
r10456 r10464 219 219 <DependentUpon>SlidingWindowDataView.cs</DependentUpon> 220 220 </Compile> 221 <Compile Include="SymbolicDataAnalysisGenealogyGraphView.cs">222 <SubType>UserControl</SubType>223 </Compile>224 221 <Compile Include="TextualSymbolicDataAnalysisModelView.cs"> 225 222 <SubType>UserControl</SubType> -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisPopulationDiversityAnalyzer.cs
r10347 r10464 159 159 SimilarityParameter.ActualValue = new DoubleValue(); 160 160 161 var comp = new SymbolicExpressionTreeNodeSimilarityComparer {161 var comparer = new SymbolicExpressionTreeNodeSimilarityComparer { 162 162 MatchConstantValues = MatchConstantValuesParameter.Value.Value, 163 163 MatchVariableNames = MatchVariableNamesParameter.Value.Value, … … 169 169 var op = new SymbolicDataAnalysisExpressionTreeSimilarityCalculator { 170 170 CurrentSymbolicExpressionTree = tree, 171 SimilarityComparer = comp ,171 SimilarityComparer = comparer, 172 172 MaximumTreeDepth = MaximumSymbolicExpressionTreeDepth.Value 173 173 }; -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj
r10459 r10464 189 189 <SubType>Code</SubType> 190 190 </Compile> 191 <Compile Include="SymbolicDataAnalysisExpressionPruningOperator.cs" />192 191 <Compile Include="SlidingWindow\GenerationalSlidingWindowAnalyzer.cs" /> 193 192 <Compile Include="SlidingWindow\OffspringSelectionSlidingWindowAnalyzer.cs" /> … … 198 197 <Compile Include="SymbolGraph\FPGraph.cs" /> 199 198 <Compile Include="SymbolGraph\SymbolGraph.cs" /> 199 <Compile Include="SymbolicDataAnalysisExpressionPruningOperator.cs" /> 200 200 <Compile Include="SymbolicDataAnalysisExpressionTreeMatching.cs" /> 201 201 <Compile Include="SymbolicDataAnalysisExpressionTreeSimilarityCalculator.cs" /> -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowQualitiesAnalyzer.cs
r10347 r10464 92 92 93 93 var problemData = (IRegressionProblemData)ProblemDataParameter.ActualValue; 94 var evaluator = 95 (SymbolicDataAnalysisSingleObjectiveEvaluator<IRegressionProblemData>)EvaluatorParameter.ActualValue; 94 var evaluator = (SymbolicDataAnalysisSingleObjectiveEvaluator<IRegressionProblemData>)EvaluatorParameter.ActualValue; 96 95 var context = new Core.ExecutionContext(ExecutionContext, evaluator, new Scope()); 97 96 var fitnessCalculationPartition = FitnessCalculationPartitionParameter.ActualValue; -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionPruningOperator.cs
r10459 r10464 142 142 143 143 quality -= impactValue; 144 144 145 prunedSubtrees++; 145 146 } 146 147 // Quality.Value = quality; // update quality according to what has been pruned148 147 149 148 if (prunedSubtrees > 0) prunedTrees = 1; … … 160 159 } 161 160 protected abstract ISymbolicDataAnalysisModel CreateModel(); 162 protected abstract double Evaluate();163 161 protected abstract double Evaluate(IDataAnalysisModel model); 164 162 } -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeSimilarityCalculator.cs
r10456 r10464 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 42 42 get { return (IScopeTreeLookupParameter<ISymbolicExpressionTree>)Parameters[SymbolicExpressionTreeParameterName]; } 43 43 } 44 45 44 public IValueParameter<ISymbolicExpressionTree> CurrentSymbolicExpressionTreeParameter { 46 45 get { return (IValueParameter<ISymbolicExpressionTree>)Parameters[CurrentSymbolicExpressionTreeParameterName]; } 47 46 } 48 49 47 public ILookupParameter<BoolValue> MatchVariableNamesParameter { 50 48 get { return (ILookupParameter<BoolValue>)Parameters[MatchVariablesParameterName]; } 51 49 } 52 53 50 public ILookupParameter<BoolValue> MatchVariableWeightsParameter { 54 51 get { return (ILookupParameter<BoolValue>)Parameters[MatchVariableWeightsParameterName]; } 55 52 } 56 57 53 public ILookupParameter<BoolValue> MatchConstantValuesParameter { 58 54 get { return (ILookupParameter<BoolValue>)Parameters[MatchConstantValuesParameterName]; } 59 55 } 60 61 56 public ILookupParameter<DoubleValue> SimilarityParameter { 62 57 get { return (ILookupParameter<DoubleValue>)Parameters[SimilarityValuesParmeterName]; } 63 58 } 64 65 59 public ISymbolicExpressionTree CurrentSymbolicExpressionTree { 66 60 get { return CurrentSymbolicExpressionTreeParameter.Value; } 67 61 set { CurrentSymbolicExpressionTreeParameter.Value = value; } 68 62 } 69 70 63 public SymbolicExpressionTreeNodeSimilarityComparer SimilarityComparer { get; set; } 71 64
Note: See TracChangeset
for help on using the changeset viewer.