Changeset 10596 for trunk/sources

Timestamp:

03/17/14 10:31:13 (11 years ago)

Author:

mkommend

Message:

#2169: Implemented solutions analyzer for symbolic regression.

Location:

trunk/sources

Files:

• HeuristicLab 3.3.sln (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSolutionsAnalyzer.cs (added)

trunk/sources/HeuristicLab 3.3.sln

@@ -387 +387 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Scripting.Views-3.3", "HeuristicLab.Scripting.Views\3.3\HeuristicLab.Scripting.Views-3.3.csproj", "{0C2917C8-7AA8-4E18-800A-C4D064F992ED}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Scripting.Development", "HeuristicLab.Scripting.Development\3.3\HeuristicLab.Scripting.Development.csproj", "{5A42CAAD-7CD2-408E-A8D3-D16A7A1920B4}"
 EndProject
 Global
@@ -1886 +1888 @@
     {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Release|x86.ActiveCfg = Release|x86
     {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Release|x86.Build.0 = Release|x86
+    {5A42CAAD-7CD2-408E-A8D3-D16A7A1920B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {5A42CAAD-7CD2-408E-A8D3-D16A7A1920B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {5A42CAAD-7CD2-408E-A8D3-D16A7A1920B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {5A42CAAD-7CD2-408E-A8D3-D16A7A1920B4}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {5A42CAAD-7CD2-408E-A8D3-D16A7A1920B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {5A42CAAD-7CD2-408E-A8D3-D16A7A1920B4}.Release|Any CPU.Build.0 = Release|Any CPU
+    {5A42CAAD-7CD2-408E-A8D3-D16A7A1920B4}.Release|x64.ActiveCfg = Release|Any CPU
+    {5A42CAAD-7CD2-408E-A8D3-D16A7A1920B4}.Release|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
     HideSolutionNode = FALSE
   EndGlobalSection
+  GlobalSection(Performance) = preSolution
+    HasPerformanceSessions = true
+  EndGlobalSection
 EndGlobal

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

@@ -121 +121 @@
     <Compile Include="SingleObjective\ConstantOptimizationAnalyzer.cs" />
     <Compile Include="SingleObjective\Evaluators\SymbolicRegressionMeanRelativeErrorEvaluator.cs" />
+    <Compile Include="SingleObjective\SymbolicRegressionSolutionsAnalyzer.cs" />
     <Compile Include="SymbolicRegressionPruningAnalyzer.cs" />
     <Compile Include="SingleObjective\Evaluators\SymbolicRegressionLogResidualEvaluator.cs" />

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

@@ -86 +86 @@
         changed = true;
       }
+      if (!Operators.OfType<SymbolicRegressionSolutionsAnalyzer>().Any()) {
+        Operators.Add(new SymbolicRegressionSolutionsAnalyzer());
+        changed = true;
+      }
       if (changed) {
         ParameterizeOperators();
@@ -106 +110 @@
       Operators.Add(new SymbolicRegressionSingleObjectiveTrainingParetoBestSolutionAnalyzer());
       Operators.Add(new SymbolicRegressionSingleObjectiveValidationParetoBestSolutionAnalyzer());
+      Operators.Add(new SymbolicRegressionSolutionsAnalyzer());
 
       ParameterizeOperators();