Changeset 12508
- Timestamp:
- 06/25/15 13:07:51 (10 years ago)
- Location:
- branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis/3.4
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs ¶
r12489 r12508 118 118 } 119 119 120 protected Dataset(Dataset dataset) : this(dataset.variableNames, dataset.variableValues.Values) { } 121 120 122 #region Backwards compatible code, remove with 3.5 121 123 private double[,] storableData; -
TabularUnified branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis/3.4/ModifiableDataset.cs ¶
r12489 r12508 40 40 public override IDeepCloneable Clone(Cloner cloner) { return new ModifiableDataset(this, cloner); } 41 41 public ModifiableDataset() : base() { } 42 43 public ModifiableDataset(Dataset dataset) : base(dataset) { } 42 44 public ModifiableDataset(IEnumerable<string> variableNames, IEnumerable<IList> variableValues) : base(variableNames, variableValues) { } 43 45 … … 56 58 variableValues[variableNames[i]][row] = list[i]; 57 59 } 58 OnRowsChanged();59 60 OnReset(); 60 61 } … … 123 124 124 125 list[row] = value; 126 OnItemChanged(row, variableNames.IndexOf(variableName)); 125 127 } 126 128 … … 153 155 154 156 bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) { 155 return ValidateValue(value, out errorMessage); 156 } 157 158 private static bool ValidateValue(string value, out string errorMessage) { 159 double dv; 160 if (double.TryParse(value, out dv)) { 161 errorMessage = string.Empty; 162 return true; 163 } 164 DateTime dt; 165 if (DateTime.TryParse(value, out dt)) { 166 errorMessage = string.Empty; 167 return true; 168 } 169 errorMessage = "Value could not be validated. Please ensure that the value is either a string, a double, or a DateTime value."; 170 return false; 157 errorMessage = string.Empty; 158 return true; 171 159 } 172 160 … … 174 162 public override event EventHandler RowsChanged; 175 163 private void OnRowsChanged() { 176 var changed= RowsChanged;177 if ( changed!= null)178 changed(this, EventArgs.Empty);164 var handler = RowsChanged; 165 if (handler != null) 166 handler(this, EventArgs.Empty); 179 167 } 180 168 181 169 public override event EventHandler ColumnsChanged; 182 170 private void OnColumnsChanged() { 183 var changed = ColumnsChanged; 184 if (changed != null) 185 changed(this, EventArgs.Empty); 186 } 187 188 public override event EventHandler RowNamesChanged; 189 private void OnRowNamesChanged() { 190 var changed = RowNamesChanged; 191 if (changed != null) 192 changed(this, EventArgs.Empty); 171 var handler = ColumnsChanged; 172 if (handler != null) 173 handler(this, EventArgs.Empty); 193 174 } 194 175 195 176 public override event EventHandler ColumnNamesChanged; 196 177 private void OnColumnNamesChanged() { 197 var changed= ColumnNamesChanged;198 if ( changed!= null)199 changed(this, EventArgs.Empty);178 var handler = ColumnNamesChanged; 179 if (handler != null) 180 handler(this, EventArgs.Empty); 200 181 } 201 182 202 183 public override event EventHandler Reset; 203 184 private void OnReset() { 204 var reset= Reset;205 if ( reset!= null)206 reset(this, EventArgs.Empty);185 var handler = Reset; 186 if (handler != null) 187 handler(this, EventArgs.Empty); 207 188 } 208 189 209 // not sure if this is really applicable in the ModifiableDataset210 // since this is not a matrix and values are changed based on row + variableName211 190 public override event EventHandler<EventArgs<int, int>> ItemChanged; 212 191 private void OnItemChanged(int rowIndex, int columnIndex) { 213 var changed= ItemChanged;214 if ( changed!= null) {215 changed(this, new EventArgs<int, int>(rowIndex, columnIndex));192 var handler = ItemChanged; 193 if (handler != null) { 194 handler(this, new EventArgs<int, int>(rowIndex, columnIndex)); 216 195 } 217 196 }
Note: See TracChangeset
for help on using the changeset viewer.