Free cookie consent management tool by TermsFeed Policy Generator

Changeset 11158


Ignore:
Timestamp:
07/09/14 13:15:37 (10 years ago)
Author:
mkommend
Message:

#2206: Reverse merged r11157.

Location:
stable
Files:
9 deleted
46 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab 3.3.sln

    r11157 r11158  
    6868    {96E5ED5B-187D-4012-9CDA-D85CDAD38342} = {96E5ED5B-187D-4012-9CDA-D85CDAD38342}
    6969    {C664305E-497C-4533-A140-967DEDB05C19} = {C664305E-497C-4533-A140-967DEDB05C19}
    70     {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E} = {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}
    7170    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0} = {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}
    7271    {E10F395F-C8A6-48AD-B470-9AA7A1F43809} = {E10F395F-C8A6-48AD-B470-9AA7A1F43809}
    7372    {B7A64A60-B538-479F-9C47-A3180C458F6C} = {B7A64A60-B538-479F-9C47-A3180C458F6C}
    7473    {0C378762-D5DB-488A-8931-2BA42B1B7CBF} = {0C378762-D5DB-488A-8931-2BA42B1B7CBF}
    75     {3B90F866-70F8-43EF-A541-51819D255B7B} = {3B90F866-70F8-43EF-A541-51819D255B7B}
    7674    {07486E68-1517-4B9D-A58D-A38E99AE71AB} = {07486E68-1517-4B9D-A58D-A38E99AE71AB}
    7775    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5} = {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}
    … …  
    117115    {AB687BBE-1BFE-476B-906D-44237135431D} = {AB687BBE-1BFE-476B-906D-44237135431D}
    118116    {66D249C3-A01D-42A8-82A2-919BC8EC3D83} = {66D249C3-A01D-42A8-82A2-919BC8EC3D83}
    119     {362A5DC3-969D-43FB-A552-D2F52B780188} = {362A5DC3-969D-43FB-A552-D2F52B780188}
    120117    {21977CC3-1757-4B3B-87BD-FF817AAA900F} = {21977CC3-1757-4B3B-87BD-FF817AAA900F}
    121118    {E4CFB0C3-0589-4893-B38E-8BEDF885C765} = {E4CFB0C3-0589-4893-B38E-8BEDF885C765}
    … …  
    398395EndProject
    399396Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3", "HeuristicLab.Problems.ExternalEvaluation.Matlab\3.3\HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.csproj", "{362A5DC3-969D-43FB-A552-D2F52B780188}"
    400 EndProject
    401 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DataPreprocessing-3.4", "HeuristicLab.DataPreprocessing\3.4\HeuristicLab.DataPreprocessing-3.4.csproj", "{3B90F866-70F8-43EF-A541-51819D255B7B}"
    402 EndProject
    403 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DataPreprocessing.Views-3.4", "HeuristicLab.DataPreprocessing.Views\3.4\HeuristicLab.DataPreprocessing.Views-3.4.csproj", "{3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}"
    404397EndProject
    405398Global
    … …  
    19371930    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|x86.ActiveCfg = Release|x86
    19381931    {362A5DC3-969D-43FB-A552-D2F52B780188}.Release|x86.Build.0 = Release|x86
    1939     {3B90F866-70F8-43EF-A541-51819D255B7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1940     {3B90F866-70F8-43EF-A541-51819D255B7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1941     {3B90F866-70F8-43EF-A541-51819D255B7B}.Debug|x64.ActiveCfg = Debug|x64
    1942     {3B90F866-70F8-43EF-A541-51819D255B7B}.Debug|x64.Build.0 = Debug|x64
    1943     {3B90F866-70F8-43EF-A541-51819D255B7B}.Debug|x86.ActiveCfg = Debug|x86
    1944     {3B90F866-70F8-43EF-A541-51819D255B7B}.Debug|x86.Build.0 = Debug|x86
    1945     {3B90F866-70F8-43EF-A541-51819D255B7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1946     {3B90F866-70F8-43EF-A541-51819D255B7B}.Release|Any CPU.Build.0 = Release|Any CPU
    1947     {3B90F866-70F8-43EF-A541-51819D255B7B}.Release|x64.ActiveCfg = Release|x64
    1948     {3B90F866-70F8-43EF-A541-51819D255B7B}.Release|x64.Build.0 = Release|x64
    1949     {3B90F866-70F8-43EF-A541-51819D255B7B}.Release|x86.ActiveCfg = Release|x86
    1950     {3B90F866-70F8-43EF-A541-51819D255B7B}.Release|x86.Build.0 = Release|x86
    1951     {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1952     {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1953     {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Debug|x64.ActiveCfg = Debug|Any CPU
    1954     {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Debug|x86.ActiveCfg = Debug|Any CPU
    1955     {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1956     {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Release|Any CPU.Build.0 = Release|Any CPU
    1957     {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Release|x64.ActiveCfg = Release|Any CPU
    1958     {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}.Release|x86.ActiveCfg = Release|Any CPU
    19591932  EndGlobalSection
    19601933  GlobalSection(SolutionProperties) = preSolution

  • stable/HeuristicLab.Algorithms.DataAnalysis

  • stable/HeuristicLab.Analysis

  • stable/HeuristicLab.Core.Views/3.3/TypeSelector.cs

  • stable/HeuristicLab.Data.Views/3.3

  • stable/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

    r11157 r11158  
    3636  public partial class StringConvertibleMatrixView : AsynchronousContentView {
    3737    protected int[] virtualRowIndices;
    38     protected List<KeyValuePair<int, SortOrder>> sortedColumnIndices;
     38    private List<KeyValuePair<int, SortOrder>> sortedColumnIndices;
    3939    private RowComparer rowComparer;
    4040
    … …  
    261261
    262262    #region DataGridView Events
    263     protected virtual void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
     263    private void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
    264264      if (!dataGridView.ReadOnly) {
    265265        string errorMessage;
    … …  
    270270      }
    271271    }
    272     protected virtual void dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) {
     272    private void dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) {
    273273      if (!dataGridView.ReadOnly) {
    274274        string value = e.Value.ToString();
    … …  
    364364    }
    365365
    366     protected virtual void PasteValuesToDataGridView() {
     366    private void PasteValuesToDataGridView() {
    367367      string[,] values = SplitClipboardString(Clipboard.GetText());
    368368      int rowIndex = 0;
    … …  
    432432    }
    433433
    434     protected void Sort() {
     434    private void Sort() {
    435435      virtualRowIndices = Sort(sortedColumnIndices);
    436436      UpdateSortGlyph();
    … …  
    542542    }
    543543
    544     protected virtual void dataGridView_SelectionChanged(object sender, EventArgs e) {
     544    private void dataGridView_SelectionChanged(object sender, EventArgs e) {
    545545      string stringFormat = "{0,20:0.0000}";
    546546      statisticsTextBox.Text = string.Empty;

  • stable/HeuristicLab.Data/3.3

  • stable/HeuristicLab.Encodings.IntegerVectorEncoding

  • stable/HeuristicLab.Encodings.PermutationEncoding

  • stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

  • stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views

  • stable/HeuristicLab.ExtLibs

  • stable/HeuristicLab.Persistence

  • stable/HeuristicLab.Problems.DataAnalysis

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs

    r11157 r11158  
    1919 */
    2020#endregion
     21
    2122
    2223namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views {
    … …  
    4849      this.exportFileDialog = new System.Windows.Forms.SaveFileDialog();
    4950      this.btnSimplify = new System.Windows.Forms.Button();
    50       this.transformModelButton = new System.Windows.Forms.Button();
    5151      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    5252      this.splitContainer.Panel1.SuspendLayout();
    … …  
    6161      this.flowLayoutPanel.Controls.Add(this.btnSimplify);
    6262      this.flowLayoutPanel.Controls.Add(this.exportButton);
    63       this.flowLayoutPanel.Controls.Add(this.transformModelButton);
    6463      //
    6564      // btnSimplify
    … …  
    9190      this.toolTip.SetToolTip(this.exportButton, "Exports the symbolic regression solution to Excel.");
    9291      //
    93       // transformModelButton
    94       //
    95       this.transformModelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
    96       this.transformModelButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Event;
    97       this.transformModelButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    98       this.transformModelButton.Name = "transformModelButton";
    99       this.transformModelButton.Size = new System.Drawing.Size(135, 24);
    100       this.transformModelButton.TabIndex = 9;
    101       this.transformModelButton.Text = "Backtransform Model";
    102       this.transformModelButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
    103       this.transformModelButton.UseVisualStyleBackColor = true;
    104       this.transformModelButton.Click += new System.EventHandler(this.transformModelButton_Click);
    105       this.toolTip.SetToolTip(this.transformModelButton, "Backtransform model based on the stored transformations.");
    106       //
    10792      // SymbolicRegressionSolutionView
    10893      //
    … …  
    123108    protected System.Windows.Forms.Button exportButton;
    124109    protected System.Windows.Forms.Button btnSimplify;
    125     protected System.Windows.Forms.Button transformModelButton;
    126110  }
    127111}

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs

    r11157 r11158  
    4545      btnSimplify.Enabled = Content != null && !Locked && Content.ProblemData.TrainingIndices.Any(); // simplification is only possible if there are trainings samples
    4646      exportButton.Enabled = Content != null && !Locked;
    47       transformModelButton.Visible = Content != null && Content.ProblemData.Transformations.Any();
    48       transformModelButton.Enabled = Content != null && !Locked;
    4947    }
    5048
    5149    private void btn_SimplifyModel_Click(object sender, EventArgs e) {
    52       var view = new InteractiveSymbolicRegressionSolutionSimplifierView();
     50      InteractiveSymbolicRegressionSolutionSimplifierView view = new InteractiveSymbolicRegressionSolutionSimplifierView();
    5351      view.Content = (SymbolicRegressionSolution)this.Content.Clone();
    5452      view.Show();
    … …  
    5957      exportFileDialog.Filter = exporter.FileTypeFilter;
    6058      if (exportFileDialog.ShowDialog(this) == DialogResult.OK) {
     59
    6160        var name = exportFileDialog.FileName;
    6261        using (BackgroundWorker bg = new BackgroundWorker()) {
    … …  
    6867      }
    6968    }
    70 
    71     private void transformModelButton_Click(object sender, EventArgs e) {
    72       var mapper = new TransformationToSymbolicTreeMapper();
    73       var transformator = new SymbolicExpressionTreeBacktransformator(mapper);
    74 
    75       var transformations = Content.ProblemData.Transformations;
    76       var targetVar = Content.ProblemData.TargetVariable;
    77 
    78       var transformedModel = (ISymbolicRegressionModel)transformator.Backtransform(Content.Model, transformations, targetVar);
    79       var transformedSolution = new SymbolicRegressionSolution(transformedModel, (IRegressionProblemData)Content.ProblemData.Clone());
    80 
    81       MainFormManager.MainForm.ShowContent(transformedSolution);
    82     }
    8369  }
    8470}

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r11157 r11158  
    126126      <SubType>Code</SubType>
    127127    </Compile>
    128     <Compile Include="Interfaces\IModelBacktransformator.cs" />
    129     <Compile Include="SymbolicExpressionTreeBacktransformator.cs" />
    130128    <Compile Include="SymbolicDataAnalysisExpressionPruningOperator.cs" />
    131129    <Compile Include="Analyzers\SymbolicDataAnalysisVariableFrequencyAnalyzer.cs" />
    … …  
    144142    <Compile Include="Crossovers\SymbolicDataAnalysisExpressionSemanticSimilarityCrossover.cs" />
    145143    <Compile Include="Formatters\SymbolicDataAnalysisExpressionExcelFormatter.cs" />
    146     <Compile Include="Formatters\SymbolicDataAnalysisExpressionSmalltalkFormatter.cs" />
     144  <Compile Include="Formatters\SymbolicDataAnalysisExpressionSmalltalkFormatter.cs" />
    147145    <Compile Include="Interfaces\ISymbolicDataAnalysisExpressionCrossover.cs" />
    148146    <Compile Include="Interfaces\ISymbolicDataAnalysisImpactValuesCalculator.cs" />
    … …  
    224222    <Compile Include="Symbols\VariableConditionTreeNode.cs" />
    225223    <Compile Include="Symbols\VariableTreeNode.cs" />
    226     <Compile Include="TransformationToSymbolicTreeMapper.cs" />
    227224    <None Include="HeuristicLab.snk" />
    228225    <None Include="Plugin.cs.frame" />

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/ProblemData.cs

    r11157 r11158  
    16271627    }
    16281628
    1629     public ProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IEnumerable<ITransformation> transformations = null)
    1630       : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
     1629    public ProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable)
     1630      : base(dataset, allowedInputVariables) {
    16311631      var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
    16321632      Parameters.Add(new ConstrainedValueParameter<StringValue>(PriceChangeVariableParameterName, new ItemSet<StringValue>(variables), variables.First(x => x.Value == targetVariable)));

  • stable/HeuristicLab.Problems.DataAnalysis.Views

  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.cs

    r11157 r11158  
    5757      partitionComboBox.DataSource = Partitions;
    5858      partitionComboBox.SelectedItem = TRAININGSAMPLES;
    59       progressPanel.Visible = false;
    6059    }
    6160
    … …  
    7978        CalculateCorrelation();
    8079      } else {
    81         progressPanel.Visible = false;
    8280        dataView.Maximum = 0;
    8381        dataView.Minimum = 0;

  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r11157 r11158  
    169169      <DependentUpon>FeatureCorrelationView.cs</DependentUpon>
    170170    </Compile>
    171     <Compile Include="Interfaces\IDataPreprocessorStarter.cs" />
    172171    <Compile Include="MenuItems\ShrinkDataAnalysisRunsMenuItem.cs" />
    173172    <Compile Include="Plugin.cs" />

  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.Designer.cs

    r11157 r11158  
    4646    private void InitializeComponent() {
    4747      this.FeatureCorrelationButton = new System.Windows.Forms.Button();
    48       this.DataPreprocessingButton = new System.Windows.Forms.Button();
    4948      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5049      this.SuspendLayout();
    … …  
    7271      this.FeatureCorrelationButton.Click += new System.EventHandler(this.FeatureCorrelationButton_Click);
    7372      //
    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       //
    8473      // ProblemDataView
    8574      //
    8675      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    8776      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    88       this.Controls.Add(this.DataPreprocessingButton);
    8977      this.Controls.Add(this.FeatureCorrelationButton);
    9078      this.Name = "ProblemDataView";
    … …  
    9482      this.Controls.SetChildIndex(this.nameLabel, 0);
    9583      this.Controls.SetChildIndex(this.FeatureCorrelationButton, 0);
    96       this.Controls.SetChildIndex(this.DataPreprocessingButton, 0);
    9784      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    9885      this.ResumeLayout(false);
    … …  
    10491
    10592    protected System.Windows.Forms.Button FeatureCorrelationButton;
    106     protected System.Windows.Forms.Button DataPreprocessingButton;
    10793
    10894  }

  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.cs

    r11157 r11158  
    2929using HeuristicLab.MainForm;
    3030using HeuristicLab.MainForm.WindowsForms;
    31 using HeuristicLab.PluginInfrastructure;
    3231
    3332namespace HeuristicLab.Problems.DataAnalysis.Views {
    … …  
    101100      e.Effect = e.AllowedEffect;
    102101    }
    103 
    104     private void DataPreprocessingButton_Click(object sender, EventArgs e) {
    105       var preprocessingStarters = ApplicationManager.Manager.GetInstances<IDataPreprocessorStarter>();
    106       var starter = preprocessingStarters.FirstOrDefault();
    107       // TODO: handle possible multiple starters
    108       if (starter != null) {
    109         starter.Start(Content, this);
    110       }
    111     }
    112102  }
    113103}

  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

    r11157 r11158  
    170170        yield return value;
    171171    }
    172 
    173     public IEnumerable<string> GetStringValues(string variableName) {
    174       IList list;
    175       if (!variableValues.TryGetValue(variableName, out list))
    176         throw new ArgumentException("The variable " + variableName + " does not exist in the dataset.");
    177       List<string> values = list as List<string>;
    178       if (values == null) throw new ArgumentException("The variable " + variableName + " is not a string variable.");
    179 
    180       //mkommend yield return used to enable lazy evaluation
    181       foreach (string value in values)
    182         yield return value;
    183     }
    184 
    185     public IEnumerable<DateTime> GetDateTimeValues(string variableName) {
    186       IList list;
    187       if (!variableValues.TryGetValue(variableName, out list))
    188         throw new ArgumentException("The variable " + variableName + " does not exist in the dataset.");
    189       List<DateTime> values = list as List<DateTime>;
    190       if (values == null) throw new ArgumentException("The variable " + variableName + " is not a datetime variable.");
    191 
    192       //mkommend yield return used to enable lazy evaluation
    193       foreach (DateTime value in values)
    194         yield return value;
    195     }
    196 
    197172    public ReadOnlyCollection<double> GetReadOnlyDoubleValues(string variableName) {
    198173      IList list;
    … …  
    219194
    220195      return rows.Select(index => values[index]);
    221     }
    222 
    223     public bool VariableHasType<T>(string variableName) {
    224       return variableValues[variableName] is IList<T>;
    225196    }
    226197

  • stable/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r11157 r11158  
    141141    <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisSolution.cs" />
    142142    <Compile Include="Implementation\TimeSeriesPrognosis\TimeSeriesPrognosisSolutionBase.cs" />
    143     <Compile Include="Implementation\Transformations\CopyColumnTransformation.cs" />
    144     <Compile Include="Implementation\Transformations\ExponentialTransformation.cs" />
    145     <Compile Include="Implementation\Transformations\LinearTransformation.cs" />
    146     <Compile Include="Implementation\Transformations\LogarithmicTransformation.cs" />
    147     <Compile Include="Implementation\Transformations\PowerTransformation.cs" />
    148     <Compile Include="Implementation\Transformations\ReciprocalTransformation.cs" />
    149     <Compile Include="Implementation\Transformations\ShiftStandardDistributionTransformation.cs" />
    150     <Compile Include="Implementation\Transformations\ShiftToRangeTransformation.cs" />
    151     <Compile Include="Implementation\Transformations\Transformation.cs" />
    152143    <Compile Include="Interfaces\Classification\IClassificationEnsembleModel.cs">
    153144      <SubType>Code</SubType>
    … …  
    159150    <Compile Include="Interfaces\IDataAnalysisSolutionExporter.cs" />
    160151    <Compile Include="Interfaces\IDependencyCalculator.cs" />
    161     <Compile Include="Interfaces\ITransformation.cs" />
    162     <Compile Include="Interfaces\ITransformationMapper.cs" />
    163152    <Compile Include="Interfaces\Regression\IRegressionEnsembleModel.cs">
    164153      <SubType>Code</SubType>

  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

    r11157 r11158  
    300300    }
    301301
    302     public ClassificationProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IEnumerable<ITransformation> transformations = null)
    303       : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
     302    public ClassificationProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable)
     303      : base(dataset, allowedInputVariables) {
    304304      var validTargetVariableValues = CheckVariablesForPossibleTargetVariables(dataset).Select(x => new StringValue(x).AsReadOnly()).ToList();
    305305      var target = validTargetVariableValues.Where(x => x.Value == targetVariable).DefaultIfEmpty(validTargetVariableValues.First()).First();

  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs

    r11157 r11158  
    2121
    2222using System.Collections.Generic;
    23 using System.Linq;
    2423using HeuristicLab.Common;
    2524using HeuristicLab.Core;
    … …  
    8786    }
    8887
    89     public ClusteringProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, IEnumerable<ITransformation> transformations = null)
    90       : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
     88    public ClusteringProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables)
     89      : base(dataset, allowedInputVariables) {
    9190    }
    9291  }

  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

    r11157 r11158  
    3838    protected const string TrainingPartitionParameterName = "TrainingPartition";
    3939    protected const string TestPartitionParameterName = "TestPartition";
    40     protected const string TransformationsParameterName = "Transformations";
    4140
    4241    #region parameter properites
    … …  
    5251    public IFixedValueParameter<IntRange> TestPartitionParameter {
    5352      get { return (IFixedValueParameter<IntRange>)Parameters[TestPartitionParameterName]; }
    54     }
    55     public IFixedValueParameter<ReadOnlyItemList<ITransformation>> TransformationsParameter {
    56       get { return (IFixedValueParameter<ReadOnlyItemList<ITransformation>>)Parameters[TransformationsParameterName]; }
    5753    }
    5854    #endregion
    … …  
    9389    }
    9490
    95     public IEnumerable<ITransformation> Transformations {
    96       get { return TransformationsParameter.Value; }
    97     }
    98 
    9991    public virtual bool IsTrainingSample(int index) {
    10092      return index >= 0 && index < Dataset.Rows &&
    … …  
    119111    [StorableHook(HookType.AfterDeserialization)]
    120112    private void AfterDeserialization() {
    121       if (!Parameters.ContainsKey(TransformationsParameterName)) {
    122         Parameters.Add(new FixedValueParameter<ReadOnlyItemList<ITransformation>>(TransformationsParameterName, "", new ItemList<ITransformation>().AsReadOnly()));
    123         TransformationsParameter.Hidden = true;
    124       }
    125113      RegisterEventHandlers();
    126114    }
    127115
    128     protected DataAnalysisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, IEnumerable<ITransformation> transformations = null) {
     116    protected DataAnalysisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables) {
    129117      if (dataset == null) throw new ArgumentNullException("The dataset must not be null.");
    130118      if (allowedInputVariables == null) throw new ArgumentNullException("The allowedInputVariables must not be null.");
    … …  
    142130      int testPartitionEnd = dataset.Rows;
    143131
    144       var transformationsList = new ItemList<ITransformation>(transformations ?? Enumerable.Empty<ITransformation>());
    145 
    146132      Parameters.Add(new FixedValueParameter<Dataset>(DatasetParameterName, "", dataset));
    147133      Parameters.Add(new FixedValueParameter<ReadOnlyCheckedItemList<StringValue>>(InputVariablesParameterName, "", inputVariables.AsReadOnly()));
    148134      Parameters.Add(new FixedValueParameter<IntRange>(TrainingPartitionParameterName, "", new IntRange(trainingPartitionStart, trainingPartitionEnd)));
    149135      Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", new IntRange(testPartitionStart, testPartitionEnd)));
    150       Parameters.Add(new FixedValueParameter<ReadOnlyItemList<ITransformation>>(TransformationsParameterName, "", transformationsList.AsReadOnly()));
    151 
    152       TransformationsParameter.Hidden = true;
    153136
    154137      ((ValueParameter<Dataset>)DatasetParameter).ReactOnValueToStringChangedAndValueItemImageChanged = false;
    … …  
    161144      TrainingPartition.ValueChanged += new EventHandler(Parameter_ValueChanged);
    162145      TestPartition.ValueChanged += new EventHandler(Parameter_ValueChanged);
    163       TransformationsParameter.ValueChanged += new EventHandler(Parameter_ValueChanged);
    164146    }
    165147

  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r11157 r11158  
    137137    }
    138138
    139     public RegressionProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IEnumerable<ITransformation> transformations = null)
    140       : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
     139    public RegressionProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable)
     140      : base(dataset, allowedInputVariables) {
    141141      var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
    142142      Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>(variables), variables.Where(x => x.Value == targetVariable).First()));

  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs

    r11157 r11158  
    15821582      TrainingPartition.Start = 50;
    15831583    }
    1584     public TimeSeriesPrognosisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IEnumerable<ITransformation> transformations = null)
    1585       : base(dataset, allowedInputVariables, targetVariable, transformations ?? Enumerable.Empty<ITransformation>()) {
     1584    public TimeSeriesPrognosisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable)
     1585      : base(dataset, allowedInputVariables, targetVariable) {
    15861586      Parameters.Add(new FixedValueParameter<IntValue>(TrainingHorizonParameterName, "Specifies the horizon (how far the prognosis reaches in the future) for each training sample.", new IntValue(1)));
    15871587      Parameters.Add(new FixedValueParameter<IntValue>(TestHorizonParameterName, "Specifies the horizon (how far the prognosis reaches in the future) for each test sample.", new IntValue(1)));
    … …  
    16431643
    16441644      var trainingDataStart = TrainingIndices.First();
    1645 
     1645     
    16461646      base.AdjustProblemDataProperties(problemData);
    1647 
     1647     
    16481648      TestPartition.Start = trainingDataStart;
    16491649

  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs

    r11157 r11158  
    3939    IEnumerable<int> TestIndices { get; }
    4040
    41     IEnumerable<ITransformation> Transformations { get; }
    42 
    4341    bool IsTrainingSample(int index);
    4442    bool IsTestSample(int index);

  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Plugin.cs.frame

    r11157 r11158  
    3737  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3838  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    39   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")] 
     39  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4040  public class HeuristicLabProblemsDataAnalysisPlugin : PluginBase {
    4141  }

  • stable/HeuristicLab.Problems.Instances.DataAnalysis

  • stable/HeuristicLab.Problems.QuadraticAssignment

  • stable/HeuristicLab.Problems.TestFunctions

  • stable/HeuristicLab.Problems.TravelingSalesman.Views

  • stable/HeuristicLab.Problems.VehicleRouting

  • stable/HeuristicLab.Problems.VehicleRouting.Views

  • stable/HeuristicLab.Tests

Note: See TracChangeset for help on using the changeset viewer.