Changeset 7771 for branches

Timestamp:

04/30/12 13:09:15 (13 years ago)

Author:

sforsten

Message:

#1784: merged everything from trunk revision 7770 to branch ProblemInstancesRegressionAndClassification

• r7661:7770: Optimization.Views
• r7661:7770: Problems.DataAnalysis.Views
• r7661:7770: Problems.Instances
• r7647:7770: Problems.QuadraticAssignment.Views

Location:

branches/ProblemInstancesRegressionAndClassification

Files:

• HeuristicLab.Optimization.Views (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/RunView.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/CreateEnsembleMenuItem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs (modified) (5 diffs)
• HeuristicLab.Problems.Instances (modified) (1 prop)
• HeuristicLab.Problems.Instances.TSPLIB.Views (modified) (1 prop)
• HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj (modified) (6 diffs)
• HeuristicLab.Problems.QuadraticAssignment.Views (modified) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QAPVisualizationControl.cs (modified) (2 diffs)
• HeuristicLab.Problems.TravelingSalesman.Views (modified) (1 prop)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/RunView.cs

@@ -44 +44 @@
     }
 
-    public override bool ReadOnly {
-      get { return true; }
-      set { /*not needed because runs are always readonly */}
-    }
-
     /// <summary>
     /// Initializes a new instance of <see cref="VariableView"/> with caption "Variable".
@@ -83 +78 @@
       listView.Enabled = Content != null;
       detailsGroupBox.Enabled = (Content != null) && (listView.SelectedItems.Count == 1);
-      viewHost.Enabled = Content != null;
-      viewHost.ReadOnly = ReadOnly;
       changeColorButton.Enabled = Content != null;
       showAlgorithmButton.Enabled = Content != null && Content.Algorithm != null && !Locked;
+    }
+
+    protected override void PropagateStateChanges(Control control, Type type, System.Reflection.PropertyInfo propertyInfo) {
+      if (propertyInfo.Name == "ReadOnly") return;
+      base.PropagateStateChanges(control, type, propertyInfo);
     }
 

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/CreateEnsembleMenuItem.cs

@@ -73 +73 @@
               .First()
               .ProblemData.Clone();
-            var ensemble = new RegressionEnsembleSolution(Enumerable.Empty<IRegressionModel>(), problemData);
+            var ensemble = new RegressionEnsembleSolution(problemData);
             ensemble.Name = group.Key + " ensemble";
             var nestedSolutions = group.OfType<RegressionEnsembleSolution>().SelectMany(e => e.RegressionSolutions);

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.Designer.cs

@@ -49 +49 @@
       this.chart.TabIndex = 0;
       this.chart.Text = "chart";
-      this.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown);
+      this.chart.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.Chart_MouseDoubleClick);
+      this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
       // 
       // label1

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs

@@ -27 +27 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("Error Characteristics Curve")]
@@ -104 +105 @@
       var originalValues = GetOriginalValues().ToList();
       constantModel = CreateConstantModel();
-      var meanModelEstimatedValues = GetEstimatedValues(constantModel);
-      var meanModelResiduals = GetResiduals(originalValues, meanModelEstimatedValues);
-
-      meanModelResiduals.Sort();
-      chart.ChartAreas[0].AxisX.Maximum = Math.Ceiling(meanModelResiduals.Last());
-      chart.ChartAreas[0].CursorX.Interval = meanModelResiduals.First() / 100;
-
-      Series meanModelSeries = new Series("Mean Model");
-      meanModelSeries.ChartType = SeriesChartType.FastLine;
-      UpdateSeries(meanModelResiduals, meanModelSeries);
-      meanModelSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(meanModelSeries);
-      meanModelSeries.Tag = constantModel;
-      chart.Series.Add(meanModelSeries);
+      var baselineEstimatedValues = GetEstimatedValues(constantModel);
+      var baselineResiduals = GetResiduals(originalValues, baselineEstimatedValues);
+
+      baselineResiduals.Sort();
+      chart.ChartAreas[0].AxisX.Maximum = Math.Ceiling(baselineResiduals.Last());
+      chart.ChartAreas[0].CursorX.Interval = baselineResiduals.First() / 100;
+
+      Series baselineSeries = new Series("Baseline");
+      baselineSeries.ChartType = SeriesChartType.FastLine;
+      UpdateSeries(baselineResiduals, baselineSeries);
+      baselineSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(baselineSeries);
+      baselineSeries.Tag = constantModel;
+      chart.Series.Add(baselineSeries);
 
       AddRegressionSolution(Content);
@@ -200 +201 @@
     }
 
-    protected IEnumerable<double> GetMeanModelEstimatedValues(IEnumerable<double> originalValues) {
+    protected IEnumerable<double> GetbaselineEstimatedValues(IEnumerable<double> originalValues) {
       double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes).Average();
       return Enumerable.Repeat(averageTrainingTarget, originalValues.Count());
@@ -229 +230 @@
     }
 
-    #region Mean Model
-    private void chart_MouseDown(object sender, MouseEventArgs e) {
-      if (e.Clicks < 2) return;
+    #region Baseline
+    private void Chart_MouseDoubleClick(object sender, MouseEventArgs e) {
       HitTestResult result = chart.HitTest(e.X, e.Y);
       if (result.ChartElementType != ChartElementType.LegendItem) return;
-      if (result.Series.Name != constantModel.Name) return;
 
       MainFormManager.MainForm.ShowContent((IRegressionSolution)result.Series.Tag);
@@ -242 +241 @@
       double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes).Average();
       var solution = new ConstantRegressionModel(averageTrainingTarget).CreateRegressionSolution(ProblemData);
-      solution.Name = "Mean Model";
+      solution.Name = "Baseline";
       return solution;
     }
     #endregion
+
+    private void chart_MouseMove(object sender, MouseEventArgs e) {
+      HitTestResult result = chart.HitTest(e.X, e.Y);
+      if (result.ChartElementType == ChartElementType.LegendItem)
+        Cursor = Cursors.Hand;
+      else
+        Cursor = Cursors.Default;
+    }
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj

@@ -18 +18 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
+    <OutputPath>..\..\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -26 +26 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
+    <OutputPath>..\..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -43 +43 @@
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisLogFile>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
@@ -60 +60 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisLogFile>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
@@ -77 +77 @@
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisLogFile>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
@@ -94 +94 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisLogFile>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QAPVisualizationControl.cs

@@ -308 +308 @@
         using (Graphics graphics = Graphics.FromImage(newBitmap)) {
           graphics.Clear(Color.White);
-          graphics.DrawString("Showing locations spaced out according to their distances", Font, Brushes.Black, 5, 2);
+          graphics.DrawString("Showing locations layed out according to their distances", Font, Brushes.Black, 5, 2);
 
           for (int i = 0; i < coordinates.Rows - 1; i++) {
@@ -402 +402 @@
         using (Graphics graphics = Graphics.FromImage(newBitmap)) {
           graphics.Clear(Color.White);
-          graphics.DrawString("Showing facilities spaced out according to their weights", Font, Brushes.Black, 5, 2);
+          graphics.DrawString("Showing facilities layed out according to their weights", Font, Brushes.Black, 5, 2);
 
           for (int i = 0; i < coordinates.Rows - 1; i++) {