Changeset 10134
- Timestamp:
- 11/13/13 15:15:58 (11 years ago)
- Location:
- branches/DataPreprocessing
- Files:
-
- 4 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj
r10095 r10134 68 68 <Reference Include="System" /> 69 69 <Reference Include="System.Core" /> 70 <Reference Include="System.Drawing" /> 71 <Reference Include="System.Windows.Forms" /> 70 72 <Reference Include="System.Xml.Linq" /> 71 73 <Reference Include="System.Data.DataSetExtensions" /> … … 76 78 <ItemGroup> 77 79 <None Include="Plugin.cs.frame" /> 80 <Compile Include="DataPreprocessingView.cs"> 81 <SubType>UserControl</SubType> 82 </Compile> 83 <Compile Include="DataPreprocessingView.Designer.cs"> 84 <DependentUpon>DataPreprocessingView.cs</DependentUpon> 85 </Compile> 78 86 <Compile Include="Plugin.cs" /> 79 87 <Compile Include="Properties\AssemblyInfo.cs" /> … … 94 102 <Private>False</Private> 95 103 </ProjectReference> 104 <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj"> 105 <Project>{e226881d-315f-423d-b419-a766fe0d8685}</Project> 106 <Name>HeuristicLab.Core.Views-3.3</Name> 107 </ProjectReference> 96 108 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj"> 97 109 <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project> 98 110 <Name>HeuristicLab.Core-3.3</Name> 99 111 <Private>False</Private> 112 </ProjectReference> 113 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj"> 114 <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project> 115 <Name>HeuristicLab.Data-3.3</Name> 116 </ProjectReference> 117 <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj"> 118 <Project>{ab687bbe-1bfe-476b-906d-44237135431d}</Project> 119 <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name> 120 </ProjectReference> 121 <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj"> 122 <Project>{3bd61258-31da-4b09-89c0-4f71fef5f05a}</Project> 123 <Name>HeuristicLab.MainForm-3.3</Name> 100 124 </ProjectReference> 101 125 <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj"> … … 109 133 <Private>False</Private> 110 134 </ProjectReference> 135 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj"> 136 <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project> 137 <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name> 138 </ProjectReference> 139 </ItemGroup> 140 <ItemGroup> 141 <EmbeddedResource Include="DataPreprocessingView.resx"> 142 <DependentUpon>DataPreprocessingView.cs</DependentUpon> 143 </EmbeddedResource> 111 144 </ItemGroup> 112 145 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Plugin.cs.frame
r10095 r10134 32 32 [PluginDependency("HeuristicLab.Core", "3.3")] 33 33 [PluginDependency("HeuristicLab.Persistence", "3.3")] 34 [PluginDependency("HeuristicLab.MainForm", "3.3")] 35 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 36 [PluginDependency("HeuristicLab.Problems.DataAnalysis","3.4")] 34 37 public class HeuristicLabDataPreprocessingPlugin : PluginBase { 35 38 } -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj
r9859 r10134 391 391 <Private>False</Private> 392 392 </ProjectReference> 393 <ProjectReference Include="..\..\HeuristicLab.DataPreprocessing\3.3\HeuristicLab.DataPreprocessing-3.3.csproj"> 394 <Project>{3b90f866-70f8-43ef-a541-51819d255b7b}</Project> 395 <Name>HeuristicLab.DataPreprocessing-3.3</Name> 396 </ProjectReference> 393 397 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj"> 394 398 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project> … … 467 471 <EmbeddedResource Include="FeatureCorrelation\AbstractFeatureCorrelationView.resx"> 468 472 <DependentUpon>AbstractFeatureCorrelationView.cs</DependentUpon> 473 </EmbeddedResource> 474 <EmbeddedResource Include="ProblemDataView.resx"> 475 <DependentUpon>ProblemDataView.cs</DependentUpon> 469 476 </EmbeddedResource> 470 477 </ItemGroup> -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.Designer.cs
r9456 r10134 46 46 private void InitializeComponent() { 47 47 this.FeatureCorrelationButton = new System.Windows.Forms.Button(); 48 this.DataPreprocessingButton = new System.Windows.Forms.Button(); 48 49 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); 49 50 this.SuspendLayout(); … … 71 72 this.FeatureCorrelationButton.Click += new System.EventHandler(this.FeatureCorrelationButton_Click); 72 73 // 74 // DataPreprocessingButton 75 // 76 this.DataPreprocessingButton.Location = new System.Drawing.Point(311, 45); 77 this.DataPreprocessingButton.Name = "DataPreprocessingButton"; 78 this.DataPreprocessingButton.Size = new System.Drawing.Size(121, 24); 79 this.DataPreprocessingButton.TabIndex = 5; 80 this.DataPreprocessingButton.Text = "Data Preprocessing"; 81 this.DataPreprocessingButton.UseVisualStyleBackColor = true; 82 this.DataPreprocessingButton.Click += new System.EventHandler(this.DataPreprocessingButton_Click); 83 // 73 84 // ProblemDataView 74 85 // 75 86 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 76 87 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 88 this.Controls.Add(this.DataPreprocessingButton); 77 89 this.Controls.Add(this.FeatureCorrelationButton); 78 90 this.Name = "ProblemDataView"; … … 82 94 this.Controls.SetChildIndex(this.nameLabel, 0); 83 95 this.Controls.SetChildIndex(this.FeatureCorrelationButton, 0); 96 this.Controls.SetChildIndex(this.DataPreprocessingButton, 0); 84 97 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); 85 98 this.ResumeLayout(false); … … 91 104 92 105 protected System.Windows.Forms.Button FeatureCorrelationButton; 106 protected System.Windows.Forms.Button DataPreprocessingButton; 93 107 94 108 } -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.cs
r9456 r10134 27 27 using HeuristicLab.Core.Views; 28 28 using HeuristicLab.Data; 29 using HeuristicLab.DataPreprocessing; 29 30 using HeuristicLab.MainForm; 30 31 using HeuristicLab.MainForm.WindowsForms; … … 100 101 e.Effect = e.AllowedEffect; 101 102 } 103 104 private void DataPreprocessingButton_Click(object sender, EventArgs e) { 105 Type viewType = MainFormManager.GetViewTypes(this.Content.GetType(), true).FirstOrDefault(t => typeof(DataPreprocessingView).IsAssignableFrom(t)); 106 MainFormManager.MainForm.ShowContent(Content, viewType); 107 } 102 108 } 103 109 } -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs
r9456 r10134 213 213 } 214 214 public bool ReadOnly { 215 get { return true; }215 get { return false; } 216 216 } 217 217 … … 229 229 } 230 230 public bool SetValue(string value, int rowIndex, int columnIndex) { 231 throw new NotSupportedException(); 231 var values = variableValues[variableNames[columnIndex]]; 232 object insertValue = null; 233 if (values is List<double>) 234 insertValue = Double.Parse(value); /// TODO: set culture 235 else if (values is List<string>) 236 insertValue = value; 237 else if (values is List<DateTime>) 238 insertValue = DateTime.Parse(value); 239 else 240 throw new ArgumentException("The variable values must be of type double, string or DateTime"); 241 242 variableValues[variableNames[columnIndex]][rowIndex] = insertValue; 243 return true; 232 244 } 233 245 public bool Validate(string value, out string errorMessage) {
Note: See TracChangeset
for help on using the changeset viewer.