Changeset 13252 for trunk/sources/HeuristicLab.DataPreprocessing/3.4
- Timestamp:
- 11/18/15 14:10:12 (9 years ago)
- Location:
- trunk/sources/HeuristicLab.DataPreprocessing/3.4
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/FilteredPreprocessingData.cs
r12059 r13252 119 119 throw new InvalidOperationException("DeleteColumn not possible while data is filtered"); 120 120 originalData.DeleteColumn(columnIndex); 121 } 122 123 public void RenameColumn(int columnIndex, string name) { 124 if (IsFiltered) 125 throw new InvalidOperationException("RenameColumn not possible while data is filtered"); 126 originalData.RenameColumn(columnIndex, name); 127 } 128 129 public void RenameColumns(IList<string> names) { 130 if (IsFiltered) 131 throw new InvalidOperationException("RenameColumns not possible while data is filtered"); 132 originalData.RenameColumns(names); 121 133 } 122 134 -
trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs
r12509 r13252 196 196 public abstract void DeleteColumn(int columnIndex); 197 197 198 public abstract void RenameColumn(int columnIndex, string name); 199 public abstract void RenameColumns(IList<string> list); 200 198 201 public abstract Dataset ExportToDataset(); 199 202 -
trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/TransactionalPreprocessingData.cs
r12986 r13252 265 265 } 266 266 267 public override void RenameColumn(int columnIndex, string name) { 268 SaveSnapshot(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1); 269 if (columnIndex < 0 || columnIndex > variableNames.Count) 270 throw new ArgumentOutOfRangeException("columnIndex"); 271 variableNames[columnIndex] = name; 272 273 if (!IsInTransaction) 274 OnChanged(DataPreprocessingChangedEventType.ChangeColumn, -1, -1); 275 } 276 277 public override void RenameColumns(IList<string> names) { 278 if (names == null) throw new ArgumentNullException("names"); 279 if (names.Count != variableNames.Count) throw new ArgumentException("number of names must match the number of columns.", "names"); 280 281 SaveSnapshot(DataPreprocessingChangedEventType.ChangeColumn, -1, -1); 282 for (int i = 0; i < names.Count; i++) 283 variableNames[i] = names[i]; 284 285 if (!IsInTransaction) 286 OnChanged(DataPreprocessingChangedEventType.ChangeColumn, -1, -1); 287 } 288 267 289 public override Dataset ExportToDataset() { 268 290 IList<IList> values = new List<IList>(); -
trunk/sources/HeuristicLab.DataPreprocessing/3.4/Interfaces/IPreprocessingData.cs
r12059 r13252 47 47 void DeleteColumn(int columnIndex); 48 48 49 void RenameColumn(int columnIndex, string name); 50 void RenameColumns(IList<string> names); 51 49 52 bool AreAllStringColumns(IEnumerable<int> columnIndices); 50 53 bool Validate(string value, out string errorMessage, int columnIndex); -
trunk/sources/HeuristicLab.DataPreprocessing/3.4/ProblemDataCreator.cs
r12983 r13252 63 63 var inputVariables = oldProblemData.InputVariables.ToDictionary(x => x.Value, x => x); 64 64 foreach (var variable in problemData.InputVariables) { 65 bool isChecked = oldProblemData.InputVariables.Contains(variable) && oldProblemData.InputVariables.ItemChecked(inputVariables[variable.Value]);65 bool isChecked = inputVariables.ContainsKey(variable.Value) && oldProblemData.InputVariables.ItemChecked(inputVariables[variable.Value]); 66 66 problemData.InputVariables.SetItemCheckedState(variable, isChecked); 67 67 } … … 72 72 private IDataAnalysisProblemData CreateRegressionData(RegressionProblemData oldProblemData) { 73 73 var targetVariable = oldProblemData.TargetVariable; 74 // target variable must be double and must exist in the new dataset 75 return new RegressionProblemData(ExportedDataset, GetDoubleInputVariables(targetVariable), targetVariable, Transformations); 74 if (!context.Data.VariableNames.Contains(targetVariable)) 75 targetVariable = context.Data.VariableNames.First(); 76 var inputVariables = GetDoubleInputVariables(targetVariable); 77 var newProblemData = new RegressionProblemData(ExportedDataset, inputVariables, targetVariable, Transformations); 78 return newProblemData; 76 79 } 77 80 78 81 private IDataAnalysisProblemData CreateClassificationData(ClassificationProblemData oldProblemData) { 79 // target variable must be double and must exist in the new dataset80 82 var targetVariable = oldProblemData.TargetVariable; 81 var newProblemData = new ClassificationProblemData(ExportedDataset, GetDoubleInputVariables(targetVariable), targetVariable, Transformations); 83 if (!context.Data.VariableNames.Contains(targetVariable)) 84 targetVariable = context.Data.VariableNames.First(); 85 var inputVariables = GetDoubleInputVariables(targetVariable); 86 var newProblemData = new ClassificationProblemData(ExportedDataset, inputVariables, targetVariable, Transformations); 82 87 newProblemData.PositiveClass = oldProblemData.PositiveClass; 83 88 return newProblemData;
Note: See TracChangeset
for help on using the changeset viewer.