- Timestamp:
- 04/23/14 12:38:07 (10 years ago)
- Location:
- branches/DataPreprocessing
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.cs
r10735 r10772 49 49 var statisticsLogic = new StatisticsLogic(data, searchLogic); 50 50 var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic, dataGridLogic); 51 var transformationLogic = new TransformationLogic(data, searchLogic, statisticsLogic);52 51 var lineChartLogic = new ChartLogic(data); 53 52 var histogramLogic = new ChartLogic(data); 54 53 var filterLogic = new FilterLogic(data); 55 54 56 57 58 var viewShortcuts = new ItemCollection<IViewShortcut>() { 55 var viewShortcuts = new ItemCollection<IViewShortcut> { 59 56 new DataGridContent(dataGridLogic, manipulationLogic, filterLogic), 60 57 new StatisticsContent(statisticsLogic), 61 58 new FilterContent(filterLogic), 62 new TransformationContent( transformationLogic),59 new TransformationContent(data), 63 60 new ManipulationContent(manipulationLogic), 64 61 new LineChartContent(lineChartLogic), -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj
r10771 r10772 226 226 <Name>HeuristicLab.PluginInfrastructure-3.3</Name> 227 227 </ProjectReference> 228 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Transformations\3.3\HeuristicLab.Problems.DataAnalysis.Transformations-3.3.csproj"> 229 <Project>{2e257a94-d1af-435c-99b4-5ac00eadfd6a}</Project> 230 <Name>HeuristicLab.Problems.DataAnalysis.Transformations-3.3</Name> 231 </ProjectReference> 228 232 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj"> 229 233 <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project> -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/Plugin.cs.frame
r10676 r10772 34 34 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 35 35 [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views","3.4")] 36 [PluginDependency("HeuristicLab.Problems.DataAnalysis.Transformations", "3.3")] 36 37 public class HeuristicLabDataPreprocessingPlugin : PluginBase { 37 38 } -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/TransformationView.Designer.cs
r10734 r10772 19 19 */ 20 20 #endregion 21 22 using HeuristicLab.Problems.DataAnalysis.Transformations; 21 23 22 24 namespace HeuristicLab.DataPreprocessing.Views { … … 45 47 /// </summary> 46 48 private void InitializeComponent() { 47 this.label1 = new System.Windows.Forms.Label(); 48 this.SuspendLayout(); 49 components = new System.ComponentModel.Container(); 50 this.transformationCollectionView = new HeuristicLab.Core.Views.CheckedItemCollectionView<ITransformation>(); 51 // transformationCollectionView 49 52 // 50 // label1 51 // 52 this.label1.AutoSize = true; 53 this.label1.Location = new System.Drawing.Point(26, 68); 54 this.label1.Name = "label1"; 55 this.label1.Size = new System.Drawing.Size(103, 13); 56 this.label1.TabIndex = 0; 57 this.label1.Text = "Not yet implemented"; 53 this.transformationCollectionView.Caption = "Transformations"; 54 this.transformationCollectionView.Content = null; 55 this.transformationCollectionView.Dock = System.Windows.Forms.DockStyle.Fill; 56 this.transformationCollectionView.Location = new System.Drawing.Point(0, 0); 57 this.transformationCollectionView.Name = "transformationCollectionView"; 58 this.transformationCollectionView.Size = new System.Drawing.Size(627, 528); 59 this.transformationCollectionView.TabIndex = 0; 58 60 // 59 61 // TransformationView … … 61 63 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 62 64 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 63 this.Controls.Add(this. label1);65 this.Controls.Add(this.transformationCollectionView); 64 66 this.Name = "TransformationView"; 67 this.Size = new System.Drawing.Size(627, 528); 65 68 this.ResumeLayout(false); 66 this.PerformLayout();67 69 68 70 } 69 71 70 72 #endregion 71 72 private System.Windows.Forms.Label label1; 73 private Core.Views.CheckedItemCollectionView<ITransformation> transformationCollectionView; 73 74 } 74 75 } -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/TransformationView.cs
r10712 r10772 22 22 using HeuristicLab.MainForm; 23 23 using HeuristicLab.MainForm.WindowsForms; 24 using HeuristicLab.Problems.DataAnalysis.Transformations; 24 25 25 26 namespace HeuristicLab.DataPreprocessing.Views { … … 36 37 set { base.Content = value; } 37 38 } 39 40 protected override void OnContentChanged() { 41 base.OnContentChanged(); 42 if (Content == null) { 43 transformationCollectionView.Content = null; 44 } else { 45 transformationCollectionView.Content = Content.CheckedTransformationCollection; 46 } 47 } 38 48 } 39 49 } -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs
r10740 r10772 28 28 using HeuristicLab.Data; 29 29 using HeuristicLab.Problems.DataAnalysis; 30 using HeuristicLab.Problems.DataAnalysis.Transformations; 30 31 31 32 namespace HeuristicLab.DataPreprocessing { -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/TransformationContent.cs
r10614 r10772 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using HeuristicLab.Problems.DataAnalysis; 26 using HeuristicLab.Problems.DataAnalysis.Transformations; 25 27 26 28 namespace HeuristicLab.DataPreprocessing { … … 28 30 public class TransformationContent : Item, IViewShortcut { 29 31 30 private readonly ITransformationLogic transformationLogic; 31 public TransformationContent(ITransformationLogic theTransformationLogic) { 32 transformationLogic = theTransformationLogic; 32 public IPreprocessingData Data { get; private set; } 33 34 public ICheckedItemCollection<ITransformation> CheckedTransformationCollection { get; private set; } 35 36 public TransformationContent(IPreprocessingData data) { 37 Data = data; 38 CheckedTransformationCollection = new CheckedItemCollection<ITransformation>(); 33 39 } 34 40 35 public ITransformationLogic TransformationLogic { 36 get { 37 return transformationLogic; 38 } 39 } 40 41 public TransformationContent(TransformationContent content, Cloner cloner) 42 : base(content, cloner) { 43 41 public TransformationContent(TransformationContent original, Cloner cloner) 42 : base(original, cloner) { 43 Data = original.Data; 44 CheckedTransformationCollection = new CheckedItemCollection<ITransformation>(original.CheckedTransformationCollection); 44 45 } 45 46 -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingData.cs
r10695 r10772 25 25 using HeuristicLab.Data; 26 26 using HeuristicLab.Problems.DataAnalysis; 27 using HeuristicLab.Problems.DataAnalysis.Transformations; 27 28 28 29 namespace HeuristicLab.DataPreprocessing { -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/ProblemDataCreator.cs
r10695 r10772 23 23 using System.Collections.Generic; 24 24 using HeuristicLab.Problems.DataAnalysis; 25 using HeuristicLab.Problems.DataAnalysis.Transformations; 25 26 26 27 namespace HeuristicLab.DataPreprocessing { … … 36 37 private IEnumerable<string> InputVariables { get { return context.Data.VariableNames; } } 37 38 private IEnumerable<ITransformation> Transformations { get { return context.Data.Transformations; } } 38 39 39 40 40 public ProblemDataCreator(IPreprocessingContext context) { -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Properties/AssemblyInfo.cs.frame
r10095 r10772 32 32 // You can specify all the values or you can default the Build and Revision Numbers 33 33 // by using the '*' as shown below: 34 // [assembly: AssemblyVersion("1.0.*")]35 34 [assembly: AssemblyVersion("3.3.9.0")] 36 35 [assembly: AssemblyFileVersion("3.3.9.$WCREV$")] -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Trading/3.4/ProblemData.cs
r10695 r10772 28 28 using HeuristicLab.Parameters; 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 using HeuristicLab.Problems.DataAnalysis.Transformations; 30 31 31 32 namespace HeuristicLab.Problems.DataAnalysis.Trading { -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.3/Interfaces/ITransformation.cs
r10770 r10772 23 23 using HeuristicLab.Core; 24 24 25 namespace HeuristicLab.Problems.DataAnalysis {25 namespace HeuristicLab.Problems.DataAnalysis.Transformations { 26 26 public interface ITransformation : IParameterizedItem { 27 27 string Column { get; } -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs
r10695 r10772 28 28 using HeuristicLab.Parameters; 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 using HeuristicLab.Problems.DataAnalysis.Transformations; 30 31 31 32 namespace HeuristicLab.Problems.DataAnalysis { -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs
r10695 r10772 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HeuristicLab.Problems.DataAnalysis.Transformations; 27 28 28 29 namespace HeuristicLab.Problems.DataAnalysis { -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs
r10695 r10772 29 29 using HeuristicLab.Parameters; 30 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 using HeuristicLab.Problems.DataAnalysis.Transformations; 31 32 32 33 namespace HeuristicLab.Problems.DataAnalysis { … … 118 119 [StorableHook(HookType.AfterDeserialization)] 119 120 private void AfterDeserialization() { 120 RegisterEventHandlers();121 122 121 if (!Parameters.ContainsKey(TransformationsParameterName)) { 123 122 Parameters.Add(new FixedValueParameter<ReadOnlyItemCollection<ITransformation>>(TransformationsParameterName, "", new ItemCollection<ITransformation>().AsReadOnly())); 124 123 } 124 RegisterEventHandlers(); 125 125 } 126 126 … … 160 160 TrainingPartition.ValueChanged += new EventHandler(Parameter_ValueChanged); 161 161 TestPartition.ValueChanged += new EventHandler(Parameter_ValueChanged); 162 TransformationsParameter.ValueChanged += new EventHandler(Parameter_ValueChanged); 162 163 } 163 164 -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs
r10695 r10772 28 28 using HeuristicLab.Parameters; 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 using HeuristicLab.Problems.DataAnalysis.Transformations; 30 31 31 32 namespace HeuristicLab.Problems.DataAnalysis { -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs
r10695 r10772 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Data; 26 using HeuristicLab.Problems.DataAnalysis.Transformations; 26 27 27 28 namespace HeuristicLab.Problems.DataAnalysis {
Note: See TracChangeset
for help on using the changeset viewer.