Changeset 11149 for stable

Timestamp:

07/08/14 19:36:38 (10 years ago)

Author:

mkommend

Message:

#2197: Merged r11093 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicClassificationSolutionView.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicDiscriminantFunctionClassificationSolutionView.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views/3.4/SymbolicTimeSeriesPrognosisSolutionView.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/TimeSeriesPrognosis/TimeSeriesPrognosisSolutionErrorCharacteristicsCurveView.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicClassificationSolutionView.cs

@@ -22 +22 @@
 using System;
 using System.ComponentModel;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
@@ -42 +43 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      btnSimplify.Enabled = Content != null && !Locked;
+      btnSimplify.Enabled = Content != null && !Locked && Content.ProblemData.TrainingIndices.Any(); // simplification is only possible if there are trainings samples
       exportButton.Enabled = Content != null && !Locked;
     }

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicDiscriminantFunctionClassificationSolutionView.cs

@@ -22 +22 @@
 using System;
 using System.ComponentModel;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
@@ -42 +43 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      btnSimplify.Enabled = Content != null && !Locked;
+      btnSimplify.Enabled = Content != null && !Locked && Content.ProblemData.TrainingIndices.Any(); // simplification is only possible if there are trainings samples
       exportButton.Enabled = Content != null && !Locked;
     }

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs

@@ -60 +60 @@
       double rmse, cvRmsError;
       var problemData = (IRegressionProblemData)ProblemData.Clone();
+      if(!problemData.TrainingIndices.Any()) return null; // don't create an LR model if the problem does not have a training set (e.g. loaded into an existing model)
 
       //clear checked inputVariables

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs

@@ -22 +22 @@
 using System;
 using System.ComponentModel;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
@@ -42 +43 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      btnSimplify.Enabled = Content != null && !Locked;
+      btnSimplify.Enabled = Content != null && !Locked && Content.ProblemData.TrainingIndices.Any(); // simplification is only possible if there are trainings samples
       exportButton.Enabled = Content != null && !Locked;
     }

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views/3.4/SymbolicTimeSeriesPrognosisSolutionView.cs

@@ -21 +21 @@
 
 using System;
-using System.Windows.Forms;
+using System.Linq;
 using HeuristicLab.MainForm;
 using HeuristicLab.Problems.DataAnalysis.Views;
@@ -40 +40 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      btnSimplify.Enabled = Content != null && !Locked;
+      btnSimplify.Enabled = Content != null && !Locked && Content.ProblemData.TrainingIndices.Any(); // simplification is only possible if there are trainings samples
     }
 
     private void btn_SimplifyModel_Click(object sender, EventArgs e) {
-      InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView view = new InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView();
+      var view = new InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView();
       view.Content = (SymbolicTimeSeriesPrognosisSolution)this.Content.Clone();
       view.Show();

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs

@@ -99 +99 @@
       chart.Series.Clear();
       chart.Annotations.Clear();
+
       if (Content == null) return;
-
-      var constantModel = CreateConstantModel();
-      var originalValues = GetOriginalValues().ToList();
-      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;
-      baselineSeries.LegendToolTip = "Double-click to open model";
-      chart.Series.Add(baselineSeries);
+      if (cmbSamples.SelectedItem.ToString() == TrainingSamples && !ProblemData.TrainingIndices.Any()) return;
+      if (cmbSamples.SelectedItem.ToString() == TestSamples && !ProblemData.TestIndices.Any()) return;
+
+      if (Content.ProblemData.TrainingIndices.Any()) {
+        var constantModel = CreateConstantModel();
+        var originalValues = GetOriginalValues().ToList();
+        var baselineEstimatedValues = GetEstimatedValues(constantModel);
+        var baselineResiduals = GetResiduals(originalValues, baselineEstimatedValues);
+
+        Series baselineSeries = new Series("Baseline");
+        baselineSeries.ChartType = SeriesChartType.FastLine;
+        UpdateSeries(baselineResiduals, baselineSeries);
+        baselineSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(baselineSeries);
+        baselineSeries.Tag = constantModel;
+        baselineSeries.LegendToolTip = "Double-click to open model";
+        chart.Series.Add(baselineSeries);
+      }
 
       AddRegressionSolution(Content);
@@ -127 +128 @@
       solutionSeries.Tag = solution;
       solutionSeries.ChartType = SeriesChartType.FastLine;
-      var estimatedValues = GetResiduals(GetOriginalValues(), GetEstimatedValues(solution));
-      UpdateSeries(estimatedValues, solutionSeries);
+      var residuals = GetResiduals(GetOriginalValues(), GetEstimatedValues(solution));
+      
+      chart.ChartAreas[0].AxisX.Maximum = Math.Ceiling(residuals.Max());
+      chart.ChartAreas[0].CursorX.Interval = residuals.Min() / 100;
+
+      UpdateSeries(residuals, solutionSeries);
+
       solutionSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(solutionSeries);
       solutionSeries.LegendToolTip = "Double-click to open model";
@@ -236 +242 @@
       double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndices).Average();
       var model = new ConstantRegressionModel(averageTrainingTarget);
-      var solution = new ConstantRegressionSolution(model,(IRegressionProblemData)ProblemData.Clone());
+      var solution = new ConstantRegressionSolution(model, (IRegressionProblemData)ProblemData.Clone());
       solution.Name = "Baseline";
       return solution;

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/TimeSeriesPrognosis/TimeSeriesPrognosisSolutionErrorCharacteristicsCurveView.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Forms;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
+
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("Error Characteristics Curve")]
@@ -51 +50 @@
       if (Content == null) return;
 
-      //AR1 model
-      double alpha, beta;
-      OnlineCalculatorError errorState;
       IEnumerable<double> trainingStartValues = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndices.Select(r => r - 1).Where(r => r > 0)).ToList();
-      OnlineLinearScalingParameterCalculator.Calculate(ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndices.Where(x => x > 0)), trainingStartValues, out alpha, out beta, out errorState);
-      var AR1model = new TimeSeriesPrognosisAutoRegressiveModel(ProblemData.TargetVariable, new double[] { beta }, alpha).CreateTimeSeriesPrognosisSolution(ProblemData);
-      AR1model.Name = "AR(1) Model";
-      AddRegressionSolution(AR1model);
+      if (trainingStartValues.Any()) {
+        //AR1 model
+        double alpha, beta;
+        OnlineCalculatorError errorState;
+        OnlineLinearScalingParameterCalculator.Calculate(ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndices.Where(x => x > 0)), trainingStartValues, out alpha, out beta, out errorState);
+        var ar1model = new TimeSeriesPrognosisAutoRegressiveModel(ProblemData.TargetVariable, new double[] { beta }, alpha).CreateTimeSeriesPrognosisSolution(ProblemData);
+        ar1model.Name = "AR(1) Model";
+        AddRegressionSolution(ar1model);
+      }
     }
   }