Changeset 10854


Ignore:
Timestamp:
05/14/14 15:42:35 (5 years ago)
Author:
pfleck
Message:
  • Started implementing backtransforming of model with preprocessing transformations.
Location:
branches/DataPreprocessing
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.csproj

    r8600 r10854  
    242242      <Private>False</Private>
    243243    </ProjectReference>
     244    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Transformations\3.3\HeuristicLab.Problems.DataAnalysis.Transformations-3.3.csproj">
     245      <Project>{2e257a94-d1af-435c-99b4-5ac00eadfd6a}</Project>
     246      <Name>HeuristicLab.Problems.DataAnalysis.Transformations-3.3</Name>
     247    </ProjectReference>
    244248    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
    245249      <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>
     
    284288  -->
    285289  <PropertyGroup>
    286    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     290    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    287291set ProjectDir=$(ProjectDir)
    288292set SolutionDir=$(SolutionDir)
     
    291295call PreBuildEvent.cmd
    292296</PreBuildEvent>
    293 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     297    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    294298export ProjectDir=$(ProjectDir)
    295299export SolutionDir=$(SolutionDir)
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/Plugin.cs.frame

    r10037 r10854  
    3939  [PluginDependency("HeuristicLab.Optimization","3.3")]
    4040  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
     41  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Transformations", "3.3")]
    4142  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
    4243  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression", "3.4")]
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs

    r9973 r10854  
    4646    private void InitializeComponent() {
    4747      this.btnSimplify = new System.Windows.Forms.Button();
     48      this.transformModelButton = new System.Windows.Forms.Button();
    4849      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    4950      this.splitContainer.Panel1.SuspendLayout();
     
    6061      //
    6162      this.splitContainer.Panel1.Controls.Add(this.btnSimplify);
     63      //
     64      // splitContainer.Panel2
     65      //
     66      this.splitContainer.Panel2.Controls.Add(this.transformModelButton);
    6267      //
    6368      // addButton
     
    8085      this.btnSimplify.Click += new System.EventHandler(this.btn_SimplifyModel_Click);
    8186      //
     87      // transformModelButton
     88      //
     89      this.transformModelButton.Location = new System.Drawing.Point(84, 3);
     90      this.transformModelButton.Name = "transformModelButton";
     91      this.transformModelButton.Size = new System.Drawing.Size(100, 23);
     92      this.transformModelButton.TabIndex = 8;
     93      this.transformModelButton.Text = "Backtransform Model";
     94      this.transformModelButton.UseVisualStyleBackColor = true;
     95      this.transformModelButton.Click += new System.EventHandler(this.transformModelButton_Click);
     96      //
    8297      // SymbolicRegressionSolutionView
    8398      //
     
    96111    #endregion
    97112    private System.Windows.Forms.Button btnSimplify;
     113    private System.Windows.Forms.Button transformModelButton;
    98114  }
    99115}
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs

    r9456 r10854  
    3838    }
    3939
     40    protected override void SetEnabledStateOfControls() {
     41      base.SetEnabledStateOfControls();
     42      if (Content == null) {
     43        transformModelButton.Enabled = false;
     44      } else {
     45        transformModelButton.Enabled = !Locked;
     46      }
     47    }
     48
    4049    private void btn_SimplifyModel_Click(object sender, EventArgs e) {
    4150      InteractiveSymbolicRegressionSolutionSimplifierView view = new InteractiveSymbolicRegressionSolutionSimplifierView();
     
    4352      view.Show();
    4453    }
     54
     55    private void transformModelButton_Click(object sender, EventArgs e) {
     56      var mapper = new TransformationToSymbolicTreeMapper();
     57      var transformator = new SymbolicExpressionTreeBacktransformator(mapper);
     58      var model = transformator.Backtransform(Content.Model, Content.ProblemData.Transformations);
     59      MainFormManager.MainForm.ShowContent(model);
     60    }
    4561  }
    4662}
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r10845 r10854  
    126126      <SubType>Code</SubType>
    127127    </Compile>
     128    <Compile Include="SymbolicExpressionTreeBacktransformator.cs" />
    128129    <Compile Include="SymbolicDataAnalysisExpressionPruningOperator.cs" />
    129130    <Compile Include="Analyzers\SymbolicDataAnalysisVariableFrequencyAnalyzer.cs" />
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r10845 r10854  
    150150    <Compile Include="Interfaces\IDataAnalysisSolutionExporter.cs" />
    151151    <Compile Include="Interfaces\IDependencyCalculator.cs" />
     152    <Compile Include="Interfaces\IModelBacktransformator.cs" />
    152153    <Compile Include="Interfaces\ITransformationMapper.cs" />
    153154    <Compile Include="Interfaces\Regression\IRegressionEnsembleModel.cs">
  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/ITransformationMapper.cs

    r10845 r10854  
    2020#endregion
    2121
    22 
    2322using HeuristicLab.Problems.DataAnalysis.Transformations;
    2423
    2524namespace HeuristicLab.Problems.DataAnalysis {
    26   public interface ITransformationMapper<T> {
     25  public interface ITransformationMapper<out T> {
    2726    T GenerateModel(ITransformation transformation);
    2827    T GenerateInverseModel(ITransformation transformation);
Note: See TracChangeset for help on using the changeset viewer.