Changeset 7122 for trunk

Timestamp:

12/05/11 10:58:54 (13 years ago)

Author:

mkommend

Message:

#1621: Renamed ResponseFunctionView and changed ordering of variable sliders (using the natural string comparer).

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.csproj (modified) (1 diff)
• SymbolicRegressionSolutionResponseFunctionView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicDataAnalysisSolutionResponseFunctionView.Designer.cs) (1 diff)
• SymbolicRegressionSolutionResponseFunctionView.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicDataAnalysisSolutionResponseFunctionView.cs) (4 diffs)

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

@@ -117 +117 @@
     </Compile>
     <Compile Include="Plugin.cs" />
-    <Compile Include="SymbolicDataAnalysisSolutionResponseFunctionView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SymbolicDataAnalysisSolutionResponseFunctionView.Designer.cs">
-      <DependentUpon>SymbolicDataAnalysisSolutionResponseFunctionView.cs</DependentUpon>
+    <Compile Include="SymbolicRegressionSolutionResponseFunctionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SymbolicRegressionSolutionResponseFunctionView.Designer.cs">
+      <DependentUpon>SymbolicRegressionSolutionResponseFunctionView.cs</DependentUpon>
     </Compile>
     <Compile Include="SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs">

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionResponseFunctionView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views {
-  partial class SymbolicDataAnalysisSolutionResponseFunctionView {
+  partial class SymbolicRegressionSolutionResponseFunctionView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionResponseFunctionView.cs

@@ -26 +26 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
+using HeuristicLab.Core.Views;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.MainForm;
@@ -33 +34 @@
   [View("Response Function View")]
   [Content(typeof(ISymbolicRegressionSolution), false)]
-  public partial class SymbolicDataAnalysisSolutionResponseFunctionView : AsynchronousContentView {
+  public partial class SymbolicRegressionSolutionResponseFunctionView : ItemView {
     private Dictionary<string, List<ISymbolicExpressionTreeNode>> variableNodes;
     private ISymbolicExpressionTree clonedTree;
     private Dictionary<string, double> medianValues;
-    public SymbolicDataAnalysisSolutionResponseFunctionView() {
+    public SymbolicRegressionSolutionResponseFunctionView() {
       InitializeComponent();
-      this.variableNodes = new Dictionary<string, List<ISymbolicExpressionTreeNode>>();
+      variableNodes = new Dictionary<string, List<ISymbolicExpressionTreeNode>>();
       medianValues = new Dictionary<string, double>();
-      this.Caption = "Response Function View";
+      Caption = "Response Function View";
     }
 
@@ -86 +87 @@
         select varNode.VariableName)
          .Distinct()
-         .OrderBy(x => x)
+         .OrderBy(x => x, new NaturalStringComparer())
          .ToList();
 
@@ -129 +130 @@
       IEnumerable<string> fixedVariables = comboBox.Items.OfType<string>()
         .Except(new string[] { freeVariable });
-      
+
       // scatter plots for subset of samples that have values near the median values for all variables
       Func<int, bool> NearMedianValue = (r) => {