Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/14/17 10:29:51 (7 years ago)
Author:
pfleck
Message:

#2709 merged to stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.DataPreprocessing

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessingmergedeligible
      /branches/crossvalidation-2434/HeuristicLab.DataPreprocessingmergedeligible
      /trunk/sources/HeuristicLab.DataPreprocessingmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing5516-5520
      /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing6917-7005
      /branches/CloningRefactoring/HeuristicLab.DataPreprocessing4656-4721
      /branches/CodeEditor/HeuristicLab.DataPreprocessing11700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing5815-6180
      /branches/DataAnalysis/HeuristicLab.DataPreprocessing4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.DataPreprocessing10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing5060
      /branches/HLScript/HeuristicLab.DataPreprocessing10331-10358
      /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.DataPreprocessing11570-12508
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing6123-9799
      /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing11130-12721
      /branches/HiveStatistics/sources/HeuristicLab.DataPreprocessing12440-12877
      /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing10202-10483
      /branches/NET40/sources/HeuristicLab.DataPreprocessing5138-5162
      /branches/NSGA-II Changes/HeuristicLab.DataPreprocessing12033-12122
      /branches/ParallelEngine/HeuristicLab.DataPreprocessing5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing7568-7810
      /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing6350-6627
      /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing6828
      /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing7787-8333
      /branches/SlaveShutdown/HeuristicLab.DataPreprocessing8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing5370-5682
      /branches/Trunk/HeuristicLab.DataPreprocessing6829-6865
      /branches/UnloadJobs/HeuristicLab.DataPreprocessing9168-9215
      /branches/VNS/HeuristicLab.DataPreprocessing5594-5752
      /branches/histogram/HeuristicLab.DataPreprocessing5959-6341
      /branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing14232-14825
      /trunk/sources/HeuristicLab.Problems.TestFunctions.MultiObjective/HeuristicLab.DataPreprocessing14175
  • stable/HeuristicLab.DataPreprocessing/3.4

  • stable/HeuristicLab.DataPreprocessing/3.4/Content/DataGridContent.cs

    r14186 r15242  
    3030namespace HeuristicLab.DataPreprocessing {
    3131
    32   [Item("DataGrid", "Represents a data grid.")]
     32  [Item("Data Grid", "Represents a data grid.")]
    3333  public class DataGridContent : Item, IStringConvertibleMatrix, IViewShortcut {
    34 
    35     public ITransactionalPreprocessingData PreProcessingData { get; private set; }
    36 
    3734    public static new Image StaticItemImage {
    3835      get { return HeuristicLab.Common.Resources.VSImageLibrary.Table; }
    3936    }
     37
     38    public ITransactionalPreprocessingData PreProcessingData { get; private set; }
    4039
    4140    public ManipulationLogic ManipulationLogic { get; private set; }
     
    4342
    4443    public int Rows {
    45       get {
    46         return PreProcessingData.Rows;
    47       }
    48       set {
    49         //does nothing
    50       }
     44      get { return PreProcessingData.Rows; }
     45      set { }
    5146    }
    5247
    5348    public int Columns {
    54       get {
    55         return PreProcessingData.Columns;
    56       }
    57       set {
    58         //does nothing
    59       }
     49      get { return PreProcessingData.Columns; }
     50      set { }
    6051    }
    6152
    6253    public IEnumerable<string> ColumnNames {
    63       get {
    64         return PreProcessingData.VariableNames;
    65       }
    66       set {
    67 
    68       }
     54      get { return PreProcessingData.VariableNames; }
     55      set { }
    6956    }
    7057
    7158    public IEnumerable<string> RowNames {
    72       get {
    73         return Enumerable.Range(1, Rows).Select(n => n.ToString());
    74       }
    75       set {
    76         throw new NotSupportedException();
    77       }
     59      get { return Enumerable.Range(1, Rows).Select(n => n.ToString()); }
     60      set { throw new NotSupportedException(); }
    7861    }
    7962
    8063    public bool SortableView {
    81       get {
    82         return true;
    83       }
    84       set {
    85         throw new NotSupportedException();
    86       }
     64      get { return true; }
     65      set { throw new NotSupportedException(); }
    8766    }
    8867
     
    9170    }
    9271
    93 
    9472    public IDictionary<int, IList<int>> Selection {
    9573      get { return PreProcessingData.Selection; }
    9674      set { PreProcessingData.Selection = value; }
    9775    }
    98 
    9976
    10077    public DataGridContent(ITransactionalPreprocessingData preProcessingData, ManipulationLogic theManipulationLogic, FilterLogic theFilterLogic) {
     
    137114    }
    138115
    139 
    140116    #region unused stuff/not implemented but necessary due to IStringConvertibleMatrix
    141117#pragma warning disable 0067
     
    154130    public event EventHandler<EventArgs<int, int>> ItemChanged;
    155131    public event EventHandler Reset;
    156 
    157132#pragma warning restore 0067
    158133    #endregion
    159 
    160134  }
    161135}
Note: See TracChangeset for help on using the changeset viewer.