Changeset 14116
- Timestamp:
- 07/19/16 16:52:14 (8 years ago)
- Location:
- stable
- Files:
-
- 11 edited
- 4 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 14024,14026,14036,14109
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Algorithms.DataAnalysis merged: 14024,14109
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj
r14028 r14116 282 282 <Compile Include="NeuralNetwork\NeuralNetworkRegression.cs" /> 283 283 <Compile Include="NeuralNetwork\NeuralNetworkRegressionSolution.cs" /> 284 <Compile Include="NonlinearRegression\NonlinearRegression.cs" /> 284 285 <Compile Include="Plugin.cs" /> 285 286 <Compile Include="Properties\AssemblyInfo.cs" /> -
stable/HeuristicLab.Algorithms.DataAnalysis/3.4/NonlinearRegression/NonlinearRegression.cs
r14024 r14116 42 42 [StorableClass] 43 43 public sealed class NonlinearRegression : FixedDataAnalysisAlgorithm<IRegressionProblem> { 44 private const string LinearRegressionModelResultName = "Regression solution";44 private const string RegressionSolutionResultName = "Regression solution"; 45 45 private const string ModelStructureParameterName = "Model structure"; 46 46 private const string IterationsParameterName = "Iterations"; … … 85 85 protected override void Run() { 86 86 var solution = CreateRegressionSolution(Problem.ProblemData, ModelStructure, Iterations); 87 Results.Add(new Result( LinearRegressionModelResultName, "The nonlinear regression solution.", solution));87 Results.Add(new Result(RegressionSolutionResultName, "The nonlinear regression solution.", solution)); 88 88 Results.Add(new Result("Root mean square error (train)", "The root of the mean of squared errors of the regression solution on the training set.", new DoubleValue(solution.TrainingRootMeanSquaredError))); 89 89 Results.Add(new Result("Root mean square error (test)", "The root of the mean of squared errors of the regression solution on the test set.", new DoubleValue(solution.TestRootMeanSquaredError))); -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic merged: 14024,14026
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression merged: 14036
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 merged: 14036
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs
r14004 r14116 332 332 terms.Add(t); 333 333 } 334 term = AutoDiff.TermBuilder.Sum(terms); 334 if (terms.Count == 1) term = -terms[0]; 335 else term = AutoDiff.TermBuilder.Sum(terms); 335 336 return true; 336 337 } -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/InfixExpressionFormatter.cs
r14024 r14116 37 37 [Item("Infix Symbolic Expression Tree Formatter", "A string formatter that converts symbolic expression trees to infix expressions.")] 38 38 39 public class InfixExpressionFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {39 public sealed class InfixExpressionFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter { 40 40 41 41 -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj
r13310 r14116 133 133 <SubType>Code</SubType> 134 134 </Compile> 135 <Compile Include="Formatters\InfixExpressionFormatter.cs" /> 135 136 <Compile Include="Formatters\SymbolicDataAnalysisExpressionMathematicaFormatter.cs" /> 136 137 <Compile Include="Formatters\SymbolicDataAnalysisExpressionCSharpFormatter.cs" /> 138 <Compile Include="Importer\InfixExpressionParser.cs" /> 137 139 <Compile Include="Importer\SymbolicExpressionImporter.cs" /> 138 140 <Compile Include="Importer\Token.cs" /> -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs
r14024 r14116 36 36 /// Variable names are case sensitive. Function names are not case sensitive. 37 37 /// </summary> 38 public class InfixExpressionParser {38 public sealed class InfixExpressionParser { 39 39 private enum TokenType { Operator, Identifier, Number, LeftPar, RightPar, End, NA }; 40 40 private class Token { -
stable/HeuristicLab.Tests
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Tests merged: 14024,14109
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/InfixExpressionParserTest.cs
r14024 r14116 31 31 [TestCategory("Problems.DataAnalysis.Symbolic")] 32 32 [TestProperty("Time", "short")] 33 public void StandardInterpreterTestTypeCoherentGrammarPerformance() {33 public void InfixExpressionParserTestFormatting() { 34 34 var formatter = new InfixExpressionFormatter(); 35 35 var parser = new InfixExpressionParser(); … … 37 37 Console.WriteLine(formatter.Format(parser.Parse("3*3"))); 38 38 Console.WriteLine(formatter.Format(parser.Parse("3 * 4"))); 39 Console.WriteLine(formatter.Format(parser.Parse("123E-03") ));39 Console.WriteLine(formatter.Format(parser.Parse("123E-03") )); 40 40 Console.WriteLine(formatter.Format(parser.Parse("123e-03"))); 41 41 Console.WriteLine(formatter.Format(parser.Parse("123e+03"))); -
stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj
r13636 r14116 563 563 <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\OnlineCalculatorPerformanceTest.cs" /> 564 564 <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\StatisticCalculatorsTest.cs" /> 565 <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\InfixExpressionParserTest.cs" /> 565 566 <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs" /> 566 567 <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculatorTest.cs" />
Note: See TracChangeset
for help on using the changeset viewer.