- Timestamp:
- 04/01/15 17:43:13 (10 years ago)
- Location:
- stable
- Files:
-
- 5 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
stable ¶
- Property svn:mergeinfo changed
/trunk/sources merged: 12103,12108,12110,12122
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression ¶
-
TabularUnified stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj ¶
r11920 r12281 123 123 </ItemGroup> 124 124 <ItemGroup> 125 <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveValidationBestSolutionAnalyzer.cs" /> 125 126 <Compile Include="Plugin.cs" /> 126 127 <Compile Include="SingleObjective\ConstantOptimizationAnalyzer.cs" /> 127 <Compile Include="SingleObjective\SymbolicRegressionSolutionsAnalyzer.cs" /> 128 <Compile Include="SymbolicRegressionPruningAnalyzer.cs" /> 129 <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveProblem.cs" /> 130 <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveValidationBestSolutionAnalyzer.cs" /> 131 <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveValidationParetoBestSolutionAnalyzer.cs" /> 132 <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveTrainingBestSolutionAnalyzer.cs" /> 133 <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveTrainingParetoBestSolutionAnalyzer.cs" /> 134 <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveOverfittingAnalyzer.cs" /> 128 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionMeanRelativeErrorEvaluator.cs" /> 129 <Compile Include="SingleObjective\SymbolicRegressionSolutionsAnalyzer.cs" /> 130 <Compile Include="SymbolicRegressionPhenotypicDiversityAnalyzer.cs" /> 131 <Compile Include="SymbolicRegressionPruningAnalyzer.cs" /> 135 132 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionLogResidualEvaluator.cs" /> 136 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionMeanRelativeErrorEvaluator.cs" /> 133 <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveValidationParetoBestSolutionAnalyzer.cs" /> 134 <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveTrainingParetoBestSolutionAnalyzer.cs" /> 137 135 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveMaxAbsoluteErrorEvaluator.cs" /> 138 136 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveMeanAbsoluteErrorEvaluator.cs" /> 139 137 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionConstantOptimizationEvaluator.cs" /> 140 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveEvaluator.cs" /> 141 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.cs" /> 142 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs" /> 138 <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveOverfittingAnalyzer.cs" /> 143 139 <Compile Include="SymbolicRegressionModel.cs" /> 144 140 <Compile Include="Interfaces\ISymbolicRegressionModel.cs" /> … … 149 145 <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveProblem.cs" /> 150 146 <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveTrainingBestSolutionAnalyzer.cs" /> 147 <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveProblem.cs" /> 148 <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveValidationBestSolutionAnalyzer.cs" /> 149 <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveTrainingBestSolutionAnalyzer.cs" /> 151 150 <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveEvaluator.cs" /> 152 <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveValidationBestSolutionAnalyzer.cs" />153 151 <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveMeanSquaredErrorTreeSizeEvaluator.cs" /> 154 152 <Compile Include="MultiObjective\SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator.cs" /> 153 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveEvaluator.cs" /> 154 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.cs" /> 155 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs" /> 155 156 <Compile Include="SymbolicRegressionPruningOperator.cs" /> 156 157 <Compile Include="SymbolicRegressionSolution.cs" /> … … 212 213 <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project> 213 214 <Name>HeuristicLab.Operators-3.3</Name> 215 <Private>False</Private> 216 </ProjectReference> 217 <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj"> 218 <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project> 219 <Name>HeuristicLab.Optimization.Operators-3.3</Name> 214 220 <Private>False</Private> 215 221 </ProjectReference> -
TabularUnified stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs ¶
r12009 r12281 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Data; 26 using HeuristicLab.Optimization; 26 27 using HeuristicLab.Parameters; 27 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 93 94 Operators.Add(new SymbolicRegressionMultiObjectiveTrainingBestSolutionAnalyzer()); 94 95 Operators.Add(new SymbolicRegressionMultiObjectiveValidationBestSolutionAnalyzer()); 96 Operators.Add(new SymbolicExpressionTreePhenotypicSimilarityCalculator()); 97 Operators.Add(new SymbolicRegressionPhenotypicDiversityAnalyzer(Operators.OfType<SymbolicExpressionTreePhenotypicSimilarityCalculator>())); 95 98 ParameterizeOperators(); 96 99 } … … 122 125 } 123 126 } 127 128 foreach (var op in Operators.OfType<ISolutionSimilarityCalculator>()) { 129 op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName; 130 op.QualityVariableName = Evaluator.QualitiesParameter.ActualName; 131 132 if (op is SymbolicExpressionTreePhenotypicSimilarityCalculator) { 133 var phenotypicSimilarityCalculator = (SymbolicExpressionTreePhenotypicSimilarityCalculator)op; 134 phenotypicSimilarityCalculator.ProblemData = ProblemData; 135 phenotypicSimilarityCalculator.Interpreter = SymbolicExpressionTreeInterpreter; 136 } 137 } 124 138 } 125 139 } -
TabularUnified stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs ¶
r12009 r12281 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using HeuristicLab.Optimization; 25 26 using HeuristicLab.Parameters; 26 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 111 112 Operators.Add(new SymbolicRegressionSingleObjectiveValidationParetoBestSolutionAnalyzer()); 112 113 Operators.Add(new SymbolicRegressionSolutionsAnalyzer()); 113 114 Operators.Add(new SymbolicExpressionTreePhenotypicSimilarityCalculator()); 115 Operators.Add(new SymbolicRegressionPhenotypicDiversityAnalyzer(Operators.OfType<SymbolicExpressionTreePhenotypicSimilarityCalculator>()) { DiversityResultName = "Phenotypic Diversity" }); 114 116 ParameterizeOperators(); 115 117 } … … 141 143 } 142 144 } 145 146 foreach (var op in Operators.OfType<ISolutionSimilarityCalculator>()) { 147 op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName; 148 op.QualityVariableName = Evaluator.QualityParameter.ActualName; 149 150 if (op is SymbolicExpressionTreePhenotypicSimilarityCalculator) { 151 var phenotypicSimilarityCalculator = (SymbolicExpressionTreePhenotypicSimilarityCalculator)op; 152 phenotypicSimilarityCalculator.ProblemData = ProblemData; 153 phenotypicSimilarityCalculator.Interpreter = SymbolicExpressionTreeInterpreter; 154 } 155 } 143 156 } 144 157 }
Note: See TracChangeset
for help on using the changeset viewer.