Free cookie consent management tool by TermsFeed Policy Generator

Changeset 10772


Ignore:
Timestamp:
04/23/14 12:38:07 (8 years ago)
Author:
pfleck
Message:
  • Current Transformations from GUI stored in TransformationContent.
  • Corrected namespace from Transformation interfaces.
Location:
branches/DataPreprocessing
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.cs

    r10735 r10772  
    4949        var statisticsLogic = new StatisticsLogic(data, searchLogic);
    5050        var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic, dataGridLogic);
    51         var transformationLogic = new TransformationLogic(data, searchLogic, statisticsLogic);
    5251        var lineChartLogic = new ChartLogic(data);
    5352        var histogramLogic = new ChartLogic(data);
    5453        var filterLogic = new FilterLogic(data);
    5554
    56        
    57 
    58         var viewShortcuts = new ItemCollection<IViewShortcut>() {
     55        var viewShortcuts = new ItemCollection<IViewShortcut> {
    5956          new DataGridContent(dataGridLogic, manipulationLogic, filterLogic),
    6057          new StatisticsContent(statisticsLogic),
    6158          new FilterContent(filterLogic),
    62           new TransformationContent(transformationLogic),
     59          new TransformationContent(data),
    6360          new ManipulationContent(manipulationLogic),
    6461          new LineChartContent(lineChartLogic),
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj

    r10771 r10772  
    226226      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    227227    </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>
    228232    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
    229233      <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/Plugin.cs.frame

    r10676 r10772  
    3434  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    3535  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views","3.4")]
     36  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Transformations", "3.3")]
    3637  public class HeuristicLabDataPreprocessingPlugin : PluginBase {
    3738  }
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/TransformationView.Designer.cs

    r10734 r10772  
    1919 */
    2020#endregion
     21
     22using HeuristicLab.Problems.DataAnalysis.Transformations;
    2123
    2224namespace HeuristicLab.DataPreprocessing.Views {
     
    4547    /// </summary>
    4648    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
    4952      //
    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;
    5860      //
    5961      // TransformationView
     
    6163      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    6264      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    63       this.Controls.Add(this.label1);
     65      this.Controls.Add(this.transformationCollectionView);
    6466      this.Name = "TransformationView";
     67      this.Size = new System.Drawing.Size(627, 528);
    6568      this.ResumeLayout(false);
    66       this.PerformLayout();
    6769
    6870    }
    6971
    7072    #endregion
    71 
    72     private System.Windows.Forms.Label label1;
     73    private Core.Views.CheckedItemCollectionView<ITransformation> transformationCollectionView;
    7374  }
    7475}
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/TransformationView.cs

    r10712 r10772  
    2222using HeuristicLab.MainForm;
    2323using HeuristicLab.MainForm.WindowsForms;
     24using HeuristicLab.Problems.DataAnalysis.Transformations;
    2425
    2526namespace HeuristicLab.DataPreprocessing.Views {
     
    3637      set { base.Content = value; }
    3738    }
     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    }
    3848  }
    3949}
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs

    r10740 r10772  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.Problems.DataAnalysis;
     30using HeuristicLab.Problems.DataAnalysis.Transformations;
    3031
    3132namespace HeuristicLab.DataPreprocessing {
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/TransformationContent.cs

    r10614 r10772  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
     25using HeuristicLab.Problems.DataAnalysis;
     26using HeuristicLab.Problems.DataAnalysis.Transformations;
    2527
    2628namespace HeuristicLab.DataPreprocessing {
     
    2830  public class TransformationContent : Item, IViewShortcut {
    2931
    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>();
    3339    }
    3440
    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);
    4445    }
    4546
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingData.cs

    r10695 r10772  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Problems.DataAnalysis;
     27using HeuristicLab.Problems.DataAnalysis.Transformations;
    2728
    2829namespace HeuristicLab.DataPreprocessing {
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/ProblemDataCreator.cs

    r10695 r10772  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Problems.DataAnalysis;
     25using HeuristicLab.Problems.DataAnalysis.Transformations;
    2526
    2627namespace HeuristicLab.DataPreprocessing {
     
    3637    private IEnumerable<string> InputVariables { get { return context.Data.VariableNames; } }
    3738    private IEnumerable<ITransformation> Transformations { get { return context.Data.Transformations; } }
    38 
    3939
    4040    public ProblemDataCreator(IPreprocessingContext context) {
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Properties/AssemblyInfo.cs.frame

    r10095 r10772  
    3232// You can specify all the values or you can default the Build and Revision Numbers
    3333// by using the '*' as shown below:
    34 // [assembly: AssemblyVersion("1.0.*")]
    3534[assembly: AssemblyVersion("3.3.9.0")]
    3635[assembly: AssemblyFileVersion("3.3.9.$WCREV$")]
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Trading/3.4/ProblemData.cs

    r10695 r10772  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Problems.DataAnalysis.Transformations;
    3031
    3132namespace HeuristicLab.Problems.DataAnalysis.Trading {
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Transformations/3.3/Interfaces/ITransformation.cs

    r10770 r10772  
    2323using HeuristicLab.Core;
    2424
    25 namespace HeuristicLab.Problems.DataAnalysis {
     25namespace HeuristicLab.Problems.DataAnalysis.Transformations {
    2626  public interface ITransformation : IParameterizedItem {
    2727    string Column { get; }
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

    r10695 r10772  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Problems.DataAnalysis.Transformations;
    3031
    3132namespace HeuristicLab.Problems.DataAnalysis {
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs

    r10695 r10772  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Problems.DataAnalysis.Transformations;
    2728
    2829namespace HeuristicLab.Problems.DataAnalysis {
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

    r10695 r10772  
    2929using HeuristicLab.Parameters;
    3030using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Problems.DataAnalysis.Transformations;
    3132
    3233namespace HeuristicLab.Problems.DataAnalysis {
     
    118119    [StorableHook(HookType.AfterDeserialization)]
    119120    private void AfterDeserialization() {
    120       RegisterEventHandlers();
    121 
    122121      if (!Parameters.ContainsKey(TransformationsParameterName)) {
    123122        Parameters.Add(new FixedValueParameter<ReadOnlyItemCollection<ITransformation>>(TransformationsParameterName, "", new ItemCollection<ITransformation>().AsReadOnly()));
    124123      }
     124      RegisterEventHandlers();
    125125    }
    126126
     
    160160      TrainingPartition.ValueChanged += new EventHandler(Parameter_ValueChanged);
    161161      TestPartition.ValueChanged += new EventHandler(Parameter_ValueChanged);
     162      TransformationsParameter.ValueChanged += new EventHandler(Parameter_ValueChanged);
    162163    }
    163164
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r10695 r10772  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Problems.DataAnalysis.Transformations;
    3031
    3132namespace HeuristicLab.Problems.DataAnalysis {
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs

    r10695 r10772  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
     26using HeuristicLab.Problems.DataAnalysis.Transformations;
    2627
    2728namespace HeuristicLab.Problems.DataAnalysis {
Note: See TracChangeset for help on using the changeset viewer.