Changeset 17970 for branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4
- Timestamp:
- 04/30/21 12:18:19 (3 years ago)
- Location:
- branches/3106_AnalyticContinuedFractionsRegression
- Files:
-
- 9 edited
- 6 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/3106_AnalyticContinuedFractionsRegression
- Property svn:mergeinfo changed
-
branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
-
branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4
- Property svn:mergeinfo changed
-
branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj
r16658 r17970 99 99 </PropertyGroup> 100 100 <ItemGroup> 101 <Reference Include="ALGLIB-3. 7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">101 <Reference Include="ALGLIB-3.17.0, Version=3.17.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 102 102 <SpecificVersion>False</SpecificVersion> 103 <HintPath>..\..\bin\ALGLIB-3. 7.0.dll</HintPath>103 <HintPath>..\..\bin\ALGLIB-3.17.0.dll</HintPath> 104 104 <Private>False</Private> 105 105 </Reference> … … 119 119 </ItemGroup> 120 120 <ItemGroup> 121 <Compile Include="Interfaces\IMultiObjectiveConstraintsEvaluator.cs" /> 122 <Compile Include="MultiObjective\NMSEMultiObjectiveConstraintsEvaluator.cs" /> 121 123 <Compile Include="MultiObjective\PearsonRSquaredNestedTreeSizeEvaluator.cs" /> 122 124 <Compile Include="MultiObjective\PearsonRSquaredNumberOfVariablesEvaluator.cs" /> 123 125 <Compile Include="MultiObjective\PearsonRSquaredAverageSimilarityEvaluator.cs" /> 124 126 <Compile Include="MultiObjective\PearsonRSquaredTreeComplexityEvaluator.cs" /> 127 <Compile Include="MultiObjective\ShapeConstrainedRegressionMultiObjectiveProblem.cs" /> 125 128 <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveValidationBestSolutionAnalyzer.cs" /> 126 129 <Compile Include="Plugin.cs" /> 130 <Compile Include="ShapeConstraintsAnalyzer.cs" /> 127 131 <Compile Include="SingleObjective\ConstantOptimizationAnalyzer.cs" /> 132 <Compile Include="SingleObjective\Evaluators\NMSESingleObjectiveConstraintsEvaluator.cs" /> 128 133 <Compile Include="SingleObjective\Evaluators\SymbolicRegressionMeanRelativeErrorEvaluator.cs" /> 134 <Compile Include="SingleObjective\ShapeConstrainedRegressionSingleObjectiveProblem.cs" /> 129 135 <Compile Include="SingleObjective\SymbolicRegressionSolutionsAnalyzer.cs" /> 130 136 <Compile Include="SymbolicRegressionPhenotypicDiversityAnalyzer.cs" /> -
branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs
r17180 r17970 60 60 public override IDeepCloneable Clone(Cloner cloner) { return new SymbolicRegressionMultiObjectiveProblem(this, cloner); } 61 61 62 public SymbolicRegressionMultiObjectiveProblem() 63 : base(new RegressionProblemData(), new SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator(), new SymbolicDataAnalysisExpressionTreeCreator()) { 62 public SymbolicRegressionMultiObjectiveProblem() : this(new RegressionProblemData(), new SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator(), new SymbolicDataAnalysisExpressionTreeCreator()) { } 63 public SymbolicRegressionMultiObjectiveProblem(IRegressionProblemData problemData, ISymbolicRegressionMultiObjectiveEvaluator evaluator, ISymbolicDataAnalysisSolutionCreator solutionCreator) 64 : base(problemData, evaluator, solutionCreator) { 64 65 Parameters.Add(new FixedValueParameter<DoubleLimit>(EstimationLimitsParameterName, EstimationLimitsParameterDescription)); 65 66 -
branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/Plugin.cs.frame
r17184 r17970 28 28 [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression","Provides classes to perform symbolic regression (single- or multiobjective).", "3.4.12.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll", PluginFileType.Assembly)] 30 [PluginDependency("HeuristicLab.ALGLIB", "3. 7.0")]30 [PluginDependency("HeuristicLab.ALGLIB", "3.17.0")] 31 31 [PluginDependency("HeuristicLab.Analysis", "3.3")] 32 32 [PluginDependency("HeuristicLab.Common", "3.3")] -
branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs
r17817 r17970 270 270 try { 271 271 alglib.lsfitcreatefg(x, y, c, n, m, k, false, out state); 272 alglib.lsfitsetcond(state, 0.0, 0.0,maxIterations);272 alglib.lsfitsetcond(state, 0.0, maxIterations); 273 273 alglib.lsfitsetxrep(state, iterationCallback != null); 274 //alglib.lsfitsetgradientcheck(state, 0.001);275 274 alglib.lsfitfit(state, function_cx_1_func, function_cx_1_grad, xrep, rowEvaluationsCounter); 276 275 alglib.lsfitresults(state, out retVal, out c, out rep); … … 285 284 286 285 //retVal == -7 => constant optimization failed due to wrong gradient 287 if (retVal != -7) { 286 // -8 => optimizer detected NAN / INF in the target 287 // function and/ or gradient 288 if (retVal != -7 && retVal != -8) { 288 289 if (applyLinearScaling) { 289 290 var tmp = new double[c.Length - 2]; -
branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs
r17180 r17970 56 56 public override IDeepCloneable Clone(Cloner cloner) { return new SymbolicRegressionSingleObjectiveProblem(this, cloner); } 57 57 58 public SymbolicRegressionSingleObjectiveProblem() 59 : base(new RegressionProblemData(), new SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator(), new SymbolicDataAnalysisExpressionTreeCreator()) { 58 public SymbolicRegressionSingleObjectiveProblem() : this(new RegressionProblemData(), new SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator(), new SymbolicDataAnalysisExpressionTreeCreator()) { 59 } 60 public SymbolicRegressionSingleObjectiveProblem(IRegressionProblemData problemData, ISymbolicRegressionSingleObjectiveEvaluator evaluator, ISymbolicDataAnalysisSolutionCreator solutionCreator) : 61 base(problemData, evaluator, solutionCreator) { 62 60 63 Parameters.Add(new FixedValueParameter<DoubleLimit>(EstimationLimitsParameterName, EstimationLimitsParameterDescription)); 61 64 … … 91 94 changed = true; 92 95 } 96 97 if (!Operators.OfType<ShapeConstraintsAnalyzer>().Any()) { 98 Operators.Add(new ShapeConstraintsAnalyzer()); 99 changed = true; 100 } 93 101 if (changed) { 94 102 ParameterizeOperators(); … … 113 121 Operators.Add(new SymbolicRegressionSolutionsAnalyzer()); 114 122 Operators.Add(new SymbolicExpressionTreePhenotypicSimilarityCalculator()); 123 Operators.Add(new ShapeConstraintsAnalyzer()); 115 124 Operators.Add(new SymbolicRegressionPhenotypicDiversityAnalyzer(Operators.OfType<SymbolicExpressionTreePhenotypicSimilarityCalculator>()) { DiversityResultName = "Phenotypic Diversity" }); 116 125 ParameterizeOperators(); -
branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs
r17579 r17970 109 109 Add(new Result(ModelBoundsResultName, "Results concerning the derivation of symbolic regression solution", value)); 110 110 } 111 112 111 } 113 112 }
Note: See TracChangeset
for help on using the changeset viewer.