Changeset 11114 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs
- Timestamp:
- 07/07/14 15:33:56 (10 years ago)
- Location:
- trunk/sources
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources
- Property svn:mergeinfo changed
-
trunk/sources/HeuristicLab.Problems.DataAnalysis
-
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs
r10540 r11114 38 38 protected const string TrainingPartitionParameterName = "TrainingPartition"; 39 39 protected const string TestPartitionParameterName = "TestPartition"; 40 protected const string TransformationsParameterName = "Transformations"; 40 41 41 42 #region parameter properites … … 51 52 public IFixedValueParameter<IntRange> TestPartitionParameter { 52 53 get { return (IFixedValueParameter<IntRange>)Parameters[TestPartitionParameterName]; } 54 } 55 public IFixedValueParameter<ReadOnlyItemList<ITransformation>> TransformationsParameter { 56 get { return (IFixedValueParameter<ReadOnlyItemList<ITransformation>>)Parameters[TransformationsParameterName]; } 53 57 } 54 58 #endregion … … 89 93 } 90 94 95 public IEnumerable<ITransformation> Transformations { 96 get { return TransformationsParameter.Value; } 97 } 98 91 99 public virtual bool IsTrainingSample(int index) { 92 100 return index >= 0 && index < Dataset.Rows && … … 111 119 [StorableHook(HookType.AfterDeserialization)] 112 120 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 } 113 125 RegisterEventHandlers(); 114 126 } 115 127 116 protected DataAnalysisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables ) {128 protected DataAnalysisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, IEnumerable<ITransformation> transformations) { 117 129 if (dataset == null) throw new ArgumentNullException("The dataset must not be null."); 118 130 if (allowedInputVariables == null) throw new ArgumentNullException("The allowedInputVariables must not be null."); … … 120 132 if (allowedInputVariables.Except(dataset.DoubleVariables).Any()) 121 133 throw new ArgumentException("All allowed input variables must be present in the dataset and of type double."); 134 135 if (transformations == null) throw new ArgumentNullException("The transformations must not be null."); 122 136 123 137 var inputVariables = new CheckedItemList<StringValue>(dataset.DoubleVariables.Select(x => new StringValue(x))); … … 130 144 int testPartitionEnd = dataset.Rows; 131 145 146 var transformationsList = new ItemList<ITransformation>(transformations); 147 132 148 Parameters.Add(new FixedValueParameter<Dataset>(DatasetParameterName, "", dataset)); 133 149 Parameters.Add(new FixedValueParameter<ReadOnlyCheckedItemList<StringValue>>(InputVariablesParameterName, "", inputVariables.AsReadOnly())); 134 150 Parameters.Add(new FixedValueParameter<IntRange>(TrainingPartitionParameterName, "", new IntRange(trainingPartitionStart, trainingPartitionEnd))); 135 151 Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", new IntRange(testPartitionStart, testPartitionEnd))); 152 Parameters.Add(new FixedValueParameter<ReadOnlyItemList<ITransformation>>(TransformationsParameterName, "", transformationsList.AsReadOnly())); 153 154 TransformationsParameter.Hidden = true; 136 155 137 156 ((ValueParameter<Dataset>)DatasetParameter).ReactOnValueToStringChangedAndValueItemImageChanged = false; … … 144 163 TrainingPartition.ValueChanged += new EventHandler(Parameter_ValueChanged); 145 164 TestPartition.ValueChanged += new EventHandler(Parameter_ValueChanged); 165 TransformationsParameter.ValueChanged += new EventHandler(Parameter_ValueChanged); 146 166 } 147 167
Note: See TracChangeset
for help on using the changeset viewer.