Changeset 2289 for trunk/sources/HeuristicLab.CEDMA.Core/3.3
- Timestamp:
- 08/14/09 15:35:10 (15 years ago)
- Location:
- trunk/sources/HeuristicLab.CEDMA.Core/3.3
- Files:
-
- 2 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.CEDMA.Core/3.3/Console.cs
r2273 r2289 30 30 using HeuristicLab.PluginInfrastructure; 31 31 using HeuristicLab.Modeling.Database.SQLServerCompact; 32 using HeuristicLab.SparseMatrix; 33 using HeuristicLab.Modeling.Database; 34 using HeuristicLab.CEDMA.Charting; 32 35 33 36 namespace HeuristicLab.CEDMA.Core { 34 37 public class Console : ItemBase, IEditable { 35 38 private static readonly string sqlServerCompactConnectionString = @"Data Source="; 39 40 public Console() 41 : base() { 42 } 36 43 37 44 private string database; … … 43 50 if (value != database) { 44 51 database = value; 45 results = null; 52 matrix = null; 53 visualMatrix = null; 46 54 } 47 55 } 48 56 } 49 57 50 private Results results;51 public Results Results{58 private Matrix matrix; 59 public Matrix Matrix { 52 60 get { 53 if ( results == null) ReloadResults();54 return results;61 if (matrix == null) LoadResults(); 62 return matrix; 55 63 } 56 64 } 57 public Console() 58 : base() { 65 66 private VisualMatrix visualMatrix; 67 public VisualMatrix VisualMatrix { 68 get { 69 if (matrix == null) 70 visualMatrix = CreateVisualMatrix(); 71 return visualMatrix; 72 } 59 73 } 60 74 … … 67 81 } 68 82 69 private void ReloadResults() { 70 results = new Results(new DatabaseService(sqlServerCompactConnectionString + Database)); 83 private void LoadResults() { 84 matrix = new Matrix(); 85 DatabaseService db = new DatabaseService(sqlServerCompactConnectionString + database); 86 db.Connect(); 87 88 foreach (var model in db.GetAllModels()) { 89 MatrixRow row = new MatrixRow(); 90 foreach (var modelResult in db.GetModelResults(model)) { 91 row.Set(modelResult.Result.Name, modelResult.Value); 92 } 93 row.Set("PersistedData", db.GetModelData(model)); 94 row.Set("TargetVariable", model.TargetVariable.Name); 95 row.Set("Algorithm", model.Algorithm.Name); 96 Dictionary<HeuristicLab.Modeling.Database.IVariable, MatrixRow> inputVariableResultsEntries = 97 new Dictionary<HeuristicLab.Modeling.Database.IVariable, MatrixRow>(); 98 99 foreach (IInputVariableResult inputVariableResult in db.GetInputVariableResults(model)) { 100 if (!inputVariableResultsEntries.ContainsKey(inputVariableResult.Variable)) { 101 inputVariableResultsEntries[inputVariableResult.Variable] = new MatrixRow(); 102 inputVariableResultsEntries[inputVariableResult.Variable].Set("InputVariableName", inputVariableResult.Variable.Name); 103 } 104 inputVariableResultsEntries[inputVariableResult.Variable].Set(inputVariableResult.Result.Name, inputVariableResult.Value); 105 } 106 row.Set("VariableImpacts", inputVariableResultsEntries.Values); 107 matrix.AddRow(row); 108 } 109 db.Disconnect(); 110 } 111 112 private VisualMatrix CreateVisualMatrix() { 113 DatabaseService db = new DatabaseService(sqlServerCompactConnectionString + database); 114 db.Connect(); 115 string[] multiDimensionalCategoricalVariables = new string[] { "VariableImpacts: InputVariableName" }; 116 string[] multiDimensionalOrdinalVariables = db.GetAllResultsForInputVariables().Select(x => "VariableImpacts: " + x.Name).ToArray(); 117 string[] ordinalVariables = db.GetAllResults().Select(r => r.Name).ToArray(); 118 string[] categoricalVariables = new string[] { "TargetVariable", "Algorithm" }; 119 120 db.Disconnect(); 121 VisualMatrix m = new VisualMatrix(Matrix, categoricalVariables, ordinalVariables, multiDimensionalCategoricalVariables, multiDimensionalOrdinalVariables); 122 return m; 71 123 } 72 124 } -
trunk/sources/HeuristicLab.CEDMA.Core/3.3/ConsoleEditor.cs
r2273 r2289 29 29 using HeuristicLab.PluginInfrastructure; 30 30 using System.Drawing; 31 using HeuristicLab.CEDMA.Charting; 31 32 32 33 namespace HeuristicLab.CEDMA.Core { … … 36 37 private Button openButton; 37 38 private Console console; 39 private VisualMatrix matrix; 38 40 39 41 public ConsoleEditor(Console console) { … … 101 103 } 102 104 103 104 105 private void resultsButton_Click(object sender, EventArgs e) { 105 106 IResultsViewFactory factory = (IResultsViewFactory)viewComboBox.SelectedItem; 106 IControl control = factory.CreateView(console. Results);107 IControl control = factory.CreateView(console.VisualMatrix); 107 108 PluginManager.ControlManager.ShowControl(control); 108 109 } -
trunk/sources/HeuristicLab.CEDMA.Core/3.3/HeuristicLab.CEDMA.Core-3.3.csproj
r2223 r2289 88 88 </ItemGroup> 89 89 <ItemGroup> 90 <Compile Include="IResultsViewFactory.cs" />91 <Compile Include="ResultsEntry.cs" />92 <Compile Include="TableResultsView.cs">93 <SubType>UserControl</SubType>94 </Compile>95 <Compile Include="TableResultsView.Designer.cs">96 <DependentUpon>TableResultsView.cs</DependentUpon>97 </Compile>98 90 <Compile Include="Console.cs" /> 99 91 <Compile Include="ConsoleEditor.cs"> … … 102 94 <Compile Include="HeuristicLabCedmaCorePlugin.cs" /> 103 95 <Compile Include="Properties\AssemblyInfo.cs" /> 104 <Compile Include="Results.cs" />105 96 </ItemGroup> 106 97 <ItemGroup> … … 108 99 </ItemGroup> 109 100 <ItemGroup> 101 <ProjectReference Include="..\..\HeuristicLab.CEDMA.Charting\3.3\HeuristicLab.CEDMA.Charting-3.3.csproj"> 102 <Project>{1BF17271-5350-476A-8F6D-FC74FA3E82CA}</Project> 103 <Name>HeuristicLab.CEDMA.Charting-3.3</Name> 104 </ProjectReference> 110 105 <ProjectReference Include="..\..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj"> 111 106 <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project> 112 107 <Name>HeuristicLab.Core-3.2</Name> 113 </ProjectReference>114 <ProjectReference Include="..\..\HeuristicLab.DataAnalysis\3.2\HeuristicLab.DataAnalysis-3.2.csproj">115 <Project>{7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}</Project>116 <Name>HeuristicLab.DataAnalysis-3.2</Name>117 </ProjectReference>118 <ProjectReference Include="..\..\HeuristicLab.Data\3.2\HeuristicLab.Data-3.2.csproj">119 <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>120 <Name>HeuristicLab.Data-3.2</Name>121 108 </ProjectReference> 122 109 <ProjectReference Include="..\..\HeuristicLab.Modeling.Database.SQLServerCompact\3.2\HeuristicLab.Modeling.Database.SQLServerCompact-3.2.csproj"> … … 128 115 <Name>HeuristicLab.Modeling.Database-3.2</Name> 129 116 </ProjectReference> 130 <ProjectReference Include="..\..\HeuristicLab.Operators\3.2\HeuristicLab.Operators-3.2.csproj">131 <Project>{A9983BA2-B3B2-475E-8E2C-62050B71D1C5}</Project>132 <Name>HeuristicLab.Operators-3.2</Name>133 </ProjectReference>134 117 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj"> 135 118 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project> 136 119 <Name>HeuristicLab.PluginInfrastructure</Name> 137 120 </ProjectReference> 121 <ProjectReference Include="..\..\HeuristicLab.SparseMatrix\3.2\HeuristicLab.SparseMatrix-3.2.csproj"> 122 <Project>{1263BB36-1F20-4960-A5CB-530746DBAD77}</Project> 123 <Name>HeuristicLab.SparseMatrix-3.2</Name> 124 </ProjectReference> 138 125 </ItemGroup> 139 126 <ItemGroup> 140 <EmbeddedResource Include="TableResultsView.resx">141 <DependentUpon>TableResultsView.cs</DependentUpon>142 </EmbeddedResource>143 127 <EmbeddedResource Include="ConsoleEditor.resx"> 144 128 <DependentUpon>ConsoleEditor.cs</DependentUpon> -
trunk/sources/HeuristicLab.CEDMA.Core/3.3/HeuristicLabCedmaCorePlugin.cs
r2223 r2289 28 28 [ClassInfo(Name = "HeuristicLab.CEDMA.Core-3.3")] 29 29 [PluginFile(Filename = "HeuristicLab.CEDMA.Core-3.3.dll", Filetype = PluginFileType.Assembly)] 30 [Dependency(Dependency = "HeuristicLab.Core-3.2")] 31 [Dependency(Dependency = "HeuristicLab.Data-3.2")] 32 [Dependency(Dependency = "HeuristicLab.DataAnalysis-3.2")] 33 [Dependency(Dependency = "HeuristicLab.Operators-3.2")] 30 [Dependency(Dependency = "HeuristicLab.CEDMA.Charting-3.3")] 31 [Dependency(Dependency = "HeuristicLab.Core-3.2")] 34 32 [Dependency(Dependency = "HeuristicLab.Modeling.Database-3.2")] 35 33 [Dependency(Dependency = "HeuristicLab.Modeling.Database.SQLServerCompact-3.2")] 34 [Dependency(Dependency = "HeuristicLab.SparseMatrix-3.2")] 36 35 public class HeuristicLabCedmaCorePlugin : PluginBase { 37 36 }
Note: See TracChangeset
for help on using the changeset viewer.