Changeset 7771 for branches/ProblemInstancesRegressionAndClassification
- Timestamp:
- 04/30/12 13:09:15 (12 years ago)
- Location:
- branches/ProblemInstancesRegressionAndClassification
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Optimization.Views merged: 7760
- Property svn:mergeinfo changed
-
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/RunView.cs
r7259 r7771 44 44 } 45 45 46 public override bool ReadOnly {47 get { return true; }48 set { /*not needed because runs are always readonly */}49 }50 51 46 /// <summary> 52 47 /// Initializes a new instance of <see cref="VariableView"/> with caption "Variable". … … 83 78 listView.Enabled = Content != null; 84 79 detailsGroupBox.Enabled = (Content != null) && (listView.SelectedItems.Count == 1); 85 viewHost.Enabled = Content != null;86 viewHost.ReadOnly = ReadOnly;87 80 changeColorButton.Enabled = Content != null; 88 81 showAlgorithmButton.Enabled = Content != null && Content.Algorithm != null && !Locked; 82 } 83 84 protected override void PropagateStateChanges(Control control, Type type, System.Reflection.PropertyInfo propertyInfo) { 85 if (propertyInfo.Name == "ReadOnly") return; 86 base.PropagateStateChanges(control, type, propertyInfo); 89 87 } 90 88 -
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Views merged: 7700-7701,7738
- Property svn:mergeinfo changed
-
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/CreateEnsembleMenuItem.cs
r7259 r7771 73 73 .First() 74 74 .ProblemData.Clone(); 75 var ensemble = new RegressionEnsembleSolution( Enumerable.Empty<IRegressionModel>(),problemData);75 var ensemble = new RegressionEnsembleSolution(problemData); 76 76 ensemble.Name = group.Key + " ensemble"; 77 77 var nestedSolutions = group.OfType<RegressionEnsembleSolution>().SelectMany(e => e.RegressionSolutions); -
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.Designer.cs
r7043 r7771 49 49 this.chart.TabIndex = 0; 50 50 this.chart.Text = "chart"; 51 this.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown); 51 this.chart.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.Chart_MouseDoubleClick); 52 this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove); 52 53 // 53 54 // label1 -
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs
r7259 r7771 27 27 using HeuristicLab.MainForm; 28 28 using HeuristicLab.MainForm.WindowsForms; 29 29 30 namespace HeuristicLab.Problems.DataAnalysis.Views { 30 31 [View("Error Characteristics Curve")] … … 104 105 var originalValues = GetOriginalValues().ToList(); 105 106 constantModel = CreateConstantModel(); 106 var meanModelEstimatedValues = GetEstimatedValues(constantModel);107 var meanModelResiduals = GetResiduals(originalValues, meanModelEstimatedValues);108 109 meanModelResiduals.Sort();110 chart.ChartAreas[0].AxisX.Maximum = Math.Ceiling( meanModelResiduals.Last());111 chart.ChartAreas[0].CursorX.Interval = meanModelResiduals.First() / 100;112 113 Series meanModelSeries = new Series("Mean Model");114 meanModelSeries.ChartType = SeriesChartType.FastLine;115 UpdateSeries( meanModelResiduals, meanModelSeries);116 meanModelSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(meanModelSeries);117 meanModelSeries.Tag = constantModel;118 chart.Series.Add( meanModelSeries);107 var baselineEstimatedValues = GetEstimatedValues(constantModel); 108 var baselineResiduals = GetResiduals(originalValues, baselineEstimatedValues); 109 110 baselineResiduals.Sort(); 111 chart.ChartAreas[0].AxisX.Maximum = Math.Ceiling(baselineResiduals.Last()); 112 chart.ChartAreas[0].CursorX.Interval = baselineResiduals.First() / 100; 113 114 Series baselineSeries = new Series("Baseline"); 115 baselineSeries.ChartType = SeriesChartType.FastLine; 116 UpdateSeries(baselineResiduals, baselineSeries); 117 baselineSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(baselineSeries); 118 baselineSeries.Tag = constantModel; 119 chart.Series.Add(baselineSeries); 119 120 120 121 AddRegressionSolution(Content); … … 200 201 } 201 202 202 protected IEnumerable<double> Get MeanModelEstimatedValues(IEnumerable<double> originalValues) {203 protected IEnumerable<double> GetbaselineEstimatedValues(IEnumerable<double> originalValues) { 203 204 double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes).Average(); 204 205 return Enumerable.Repeat(averageTrainingTarget, originalValues.Count()); … … 229 230 } 230 231 231 #region Mean Model 232 private void chart_MouseDown(object sender, MouseEventArgs e) { 233 if (e.Clicks < 2) return; 232 #region Baseline 233 private void Chart_MouseDoubleClick(object sender, MouseEventArgs e) { 234 234 HitTestResult result = chart.HitTest(e.X, e.Y); 235 235 if (result.ChartElementType != ChartElementType.LegendItem) return; 236 if (result.Series.Name != constantModel.Name) return;237 236 238 237 MainFormManager.MainForm.ShowContent((IRegressionSolution)result.Series.Tag); … … 242 241 double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes).Average(); 243 242 var solution = new ConstantRegressionModel(averageTrainingTarget).CreateRegressionSolution(ProblemData); 244 solution.Name = " Mean Model";243 solution.Name = "Baseline"; 245 244 return solution; 246 245 } 247 246 #endregion 247 248 private void chart_MouseMove(object sender, MouseEventArgs e) { 249 HitTestResult result = chart.HitTest(e.X, e.Y); 250 if (result.ChartElementType == ChartElementType.LegendItem) 251 Cursor = Cursors.Hand; 252 else 253 Cursor = Cursors.Default; 254 } 248 255 } 249 256 } -
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.Instances (added) merged: 7600,7645,7648
- Property svn:mergeinfo changed
-
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.TSPLIB.Views
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj
r7759 r7771 18 18 <DebugType>full</DebugType> 19 19 <Optimize>false</Optimize> 20 <OutputPath>..\..\ ..\..\trunk\sources\bin\</OutputPath>20 <OutputPath>..\..\bin\</OutputPath> 21 21 <DefineConstants>DEBUG;TRACE</DefineConstants> 22 22 <ErrorReport>prompt</ErrorReport> … … 26 26 <DebugType>pdbonly</DebugType> 27 27 <Optimize>true</Optimize> 28 <OutputPath>..\..\ ..\..\trunk\sources\bin\</OutputPath>28 <OutputPath>..\..\bin\</OutputPath> 29 29 <DefineConstants>TRACE</DefineConstants> 30 30 <ErrorReport>prompt</ErrorReport> … … 43 43 <DebugType>full</DebugType> 44 44 <PlatformTarget>x64</PlatformTarget> 45 <CodeAnalysisLogFile>..\..\ ..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>45 <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile> 46 46 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression> 47 47 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile> … … 60 60 <DebugType>pdbonly</DebugType> 61 61 <PlatformTarget>x64</PlatformTarget> 62 <CodeAnalysisLogFile>..\..\ ..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>62 <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile> 63 63 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression> 64 64 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile> … … 77 77 <DebugType>full</DebugType> 78 78 <PlatformTarget>x86</PlatformTarget> 79 <CodeAnalysisLogFile>..\..\ ..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>79 <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile> 80 80 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression> 81 81 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile> … … 94 94 <DebugType>pdbonly</DebugType> 95 95 <PlatformTarget>x86</PlatformTarget> 96 <CodeAnalysisLogFile>..\..\ ..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>96 <CodeAnalysisLogFile>..\..\bin\HeuristicLab.Problems.Instances-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile> 97 97 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression> 98 98 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile> -
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.QuadraticAssignment.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views (added) merged: 7769
- Property svn:mergeinfo changed
-
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QAPVisualizationControl.cs
r7416 r7771 308 308 using (Graphics graphics = Graphics.FromImage(newBitmap)) { 309 309 graphics.Clear(Color.White); 310 graphics.DrawString("Showing locations spaced out according to their distances", Font, Brushes.Black, 5, 2);310 graphics.DrawString("Showing locations layed out according to their distances", Font, Brushes.Black, 5, 2); 311 311 312 312 for (int i = 0; i < coordinates.Rows - 1; i++) { … … 402 402 using (Graphics graphics = Graphics.FromImage(newBitmap)) { 403 403 graphics.Clear(Color.White); 404 graphics.DrawString("Showing facilities spaced out according to their weights", Font, Brushes.Black, 5, 2);404 graphics.DrawString("Showing facilities layed out according to their weights", Font, Brushes.Black, 5, 2); 405 405 406 406 for (int i = 0; i < coordinates.Rows - 1; i++) { -
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.TravelingSalesman.Views
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.