Changeset 6588 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork

Timestamp:

07/25/11 15:42:14 (13 years ago)

Author:

mkommend

Message:

#1600:

• Corrected result descriptions in DataAnalysisSolution.
• Added NMSE results in IRegressionSolution.
• Split RegressionSolution into a concrete implementation class and an abstract base class RegressionSolutionBase that could also be used for RegressionEnsembleSolutions or CachingRegressionSolutions.
• Moved calculation of results in specific regression solution implementations (e.g. SymbolicRegressionSolution).

Location:

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork

Files:

• NeuralNetworkEnsembleRegressionSolution.cs (modified) (3 diffs)
• NeuralNetworkRegressionSolution.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleRegressionSolution.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -49 +45 @@
     public NeuralNetworkEnsembleRegressionSolution(IRegressionProblemData problemData, INeuralNetworkEnsembleModel nnModel)
       : base(nnModel, problemData) {
+      RecalculateResults();
     }
 
@@ -54 +51 @@
       return new NeuralNetworkEnsembleRegressionSolution(this, cloner);
     }
+
+    protected override void RecalculateResults() {
+      CalculateResults();
+    }
   }
 }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkRegressionSolution.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -49 +45 @@
     public NeuralNetworkRegressionSolution(IRegressionProblemData problemData, INeuralNetworkModel nnModel)
       : base(nnModel, problemData) {
+      RecalculateResults();
     }
 
@@ -54 +51 @@
       return new NeuralNetworkRegressionSolution(this, cloner);
     }
+
+    protected override void RecalculateResults() {
+      CalculateResults();
+    }
   }
 }