Changeset 2694 for trunk/sources/HeuristicLab.Data/3.3
- Timestamp:
- 01/28/10 05:19:03 (15 years ago)
- Location:
- trunk/sources/HeuristicLab.Data/3.3
- Files:
-
- 6 added
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Data/3.3/BoolArrayData.cs
r2677 r2694 57 57 } 58 58 59 bool IStringConvertibleMatrixData.Validate(string value) { 60 int i; 61 return int.TryParse(value, out i); 59 bool IStringConvertibleMatrixData.Validate(string value, out string errorMessage) { 60 bool val; 61 bool valid = bool.TryParse(value, out val); 62 errorMessage = string.Empty; 63 if (!valid) { 64 StringBuilder sb = new StringBuilder(); 65 sb.Append("Invalid Value (Valid Value Format: \""); 66 sb.Append(FormatPatterns.GetBoolFormatPattern()); 67 sb.Append("\")"); 68 errorMessage = sb.ToString(); 69 } 70 return valid; 62 71 } 63 72 string IStringConvertibleMatrixData.GetValue(int rowIndex, int columIndex) { … … 65 74 } 66 75 bool IStringConvertibleMatrixData.SetValue(string value, int rowIndex, int columnIndex) { 67 bool b;68 if (bool.TryParse(value, out b)) {69 this[rowIndex] = b;76 bool val; 77 if (bool.TryParse(value, out val)) { 78 this[rowIndex] = val; 70 79 return true; 71 80 } else { -
trunk/sources/HeuristicLab.Data/3.3/BoolData.cs
r2684 r2694 42 42 43 43 #region IStringConvertibleData Members 44 bool IStringConvertibleData.Validate(string value) { 45 bool b; 46 return bool.TryParse(value, out b); 44 bool IStringConvertibleData.Validate(string value, out string errorMessage) { 45 bool val; 46 bool valid = bool.TryParse(value, out val); 47 errorMessage = string.Empty; 48 if (!valid) { 49 StringBuilder sb = new StringBuilder(); 50 sb.Append("Invalid Value (Valid Value Format: \""); 51 sb.Append(FormatPatterns.GetBoolFormatPattern()); 52 sb.Append("\")"); 53 errorMessage = sb.ToString(); 54 } 55 return valid; 47 56 } 48 57 string IStringConvertibleData.GetValue() { … … 50 59 } 51 60 bool IStringConvertibleData.SetValue(string value) { 52 bool b;53 if (bool.TryParse(value, out b)) {54 Value = b;61 bool val; 62 if (bool.TryParse(value, out val)) { 63 Value = val; 55 64 return true; 56 65 } else { -
trunk/sources/HeuristicLab.Data/3.3/DateTimeData.cs
r2684 r2694 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.Globalization; 24 25 using System.Text; 25 26 using System.Xml; … … 46 47 47 48 #region IStringConvertibleData Members 48 bool IStringConvertibleData.Validate(string value) { 49 DateTime d; 50 return DateTime.TryParse(value, out d); 49 bool IStringConvertibleData.Validate(string value, out string errorMessage) { 50 DateTime val; 51 bool valid = DateTime.TryParse(value, out val); 52 errorMessage = valid ? string.Empty : "Invalid Value (values must be formatted according to the current culture settings)"; 53 return valid; 51 54 } 52 55 string IStringConvertibleData.GetValue() { … … 54 57 } 55 58 bool IStringConvertibleData.SetValue(string value) { 56 DateTime d;57 if (DateTime.TryParse(value, out d)) {58 Value = d;59 DateTime val; 60 if (DateTime.TryParse(value, out val)) { 61 Value = val; 59 62 return true; 60 63 } else { -
trunk/sources/HeuristicLab.Data/3.3/DoubleData.cs
r2684 r2694 46 46 47 47 #region IStringConvertibleData Members 48 bool IStringConvertibleData.Validate(string value) { 49 double d; 50 return double.TryParse(value, out d); 48 bool IStringConvertibleData.Validate(string value, out string errorMessage) { 49 double val; 50 bool valid = double.TryParse(value, out val); 51 errorMessage = string.Empty; 52 if (!valid) { 53 StringBuilder sb = new StringBuilder(); 54 sb.Append("Invalid Value (Valid Value Format: \""); 55 sb.Append(FormatPatterns.GetDoubleFormatPattern()); 56 sb.Append("\")"); 57 errorMessage = sb.ToString(); 58 } 59 return valid; 51 60 } 52 61 string IStringConvertibleData.GetValue() { … … 54 63 } 55 64 bool IStringConvertibleData.SetValue(string value) { 56 double d;57 if (double.TryParse(value, out d)) {58 Value = d;65 double val; 66 if (double.TryParse(value, out val)) { 67 Value = val; 59 68 return true; 60 69 } else { -
trunk/sources/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj
r2677 r2694 104 104 </Compile> 105 105 <Compile Include="BoolArrayData.cs" /> 106 <Compile Include="BoolMatrixData.cs" /> 107 <Compile Include="StringMatrixData.cs" /> 108 <Compile Include="StringArrayData.cs" /> 109 <Compile Include="FormatPatterns.cs" /> 110 <Compile Include="DoubleArrayData.cs" /> 111 <Compile Include="DoubleMatrixData.cs" /> 106 112 <Compile Include="IntMatrixData.cs" /> 107 113 <Compile Include="ValueTypeMatrixData.cs" /> -
trunk/sources/HeuristicLab.Data/3.3/IStringConvertibleData.cs
r2676 r2694 28 28 namespace HeuristicLab.Data { 29 29 public interface IStringConvertibleData { 30 bool Validate(string value );30 bool Validate(string value, out string errorMessage); 31 31 string GetValue(); 32 32 bool SetValue(string value); -
trunk/sources/HeuristicLab.Data/3.3/IStringConvertibleMatrixData.cs
r2677 r2694 33 33 int Columns { get; set; } 34 34 35 bool Validate(string value );35 bool Validate(string value, out string errorMessage); 36 36 string GetValue(int rowIndex, int columnIndex); 37 37 bool SetValue(string value, int rowIndex, int columnIndex); -
trunk/sources/HeuristicLab.Data/3.3/IntArrayData.cs
r2677 r2694 57 57 } 58 58 59 bool IStringConvertibleMatrixData.Validate(string value) { 60 int i; 61 return int.TryParse(value, out i); 59 bool IStringConvertibleMatrixData.Validate(string value, out string errorMessage) { 60 int val; 61 bool valid = int.TryParse(value, out val); 62 errorMessage = string.Empty; 63 if (!valid) { 64 StringBuilder sb = new StringBuilder(); 65 sb.Append("Invalid Value (Valid Value Format: \""); 66 sb.Append(FormatPatterns.GetIntFormatPattern()); 67 sb.Append("\")"); 68 errorMessage = sb.ToString(); 69 } 70 return valid; 62 71 } 63 72 string IStringConvertibleMatrixData.GetValue(int rowIndex, int columIndex) { … … 65 74 } 66 75 bool IStringConvertibleMatrixData.SetValue(string value, int rowIndex, int columnIndex) { 67 int i;68 if (int.TryParse(value, out i)) {69 this[rowIndex] = i;76 int val; 77 if (int.TryParse(value, out val)) { 78 this[rowIndex] = val; 70 79 return true; 71 80 } else { -
trunk/sources/HeuristicLab.Data/3.3/IntData.cs
r2684 r2694 42 42 43 43 #region IStringConvertibleData Members 44 bool IStringConvertibleData.Validate(string value) { 45 int i; 46 return int.TryParse(value, out i); 44 bool IStringConvertibleData.Validate(string value, out string errorMessage) { 45 int val; 46 bool valid = int.TryParse(value, out val); 47 errorMessage = string.Empty; 48 if (!valid) { 49 StringBuilder sb = new StringBuilder(); 50 sb.Append("Invalid Value (Valid Value Format: \""); 51 sb.Append(FormatPatterns.GetIntFormatPattern()); 52 sb.Append("\")"); 53 errorMessage = sb.ToString(); 54 } 55 return valid; 47 56 } 48 57 string IStringConvertibleData.GetValue() { … … 50 59 } 51 60 bool IStringConvertibleData.SetValue(string value) { 52 int i;53 if (int.TryParse(value, out i)) {54 Value = i;61 int val; 62 if (int.TryParse(value, out val)) { 63 Value = val; 55 64 return true; 56 65 } else { -
trunk/sources/HeuristicLab.Data/3.3/IntMatrixData.cs
r2677 r2694 57 57 } 58 58 59 bool IStringConvertibleMatrixData.Validate(string value) { 60 int i; 61 return int.TryParse(value, out i); 59 bool IStringConvertibleMatrixData.Validate(string value, out string errorMessage) { 60 int val; 61 bool valid = int.TryParse(value, out val); 62 errorMessage = string.Empty; 63 if (!valid) { 64 StringBuilder sb = new StringBuilder(); 65 sb.Append("Invalid Value (Valid Value Format: \""); 66 sb.Append(FormatPatterns.GetIntFormatPattern()); 67 sb.Append("\")"); 68 errorMessage = sb.ToString(); 69 } 70 return valid; 62 71 } 63 72 string IStringConvertibleMatrixData.GetValue(int rowIndex, int columIndex) { … … 65 74 } 66 75 bool IStringConvertibleMatrixData.SetValue(string value, int rowIndex, int columnIndex) { 67 int i;68 if (int.TryParse(value, out i)) {69 this[rowIndex, columnIndex] = i;76 int val; 77 if (int.TryParse(value, out val)) { 78 this[rowIndex, columnIndex] = val; 70 79 return true; 71 80 } else { -
trunk/sources/HeuristicLab.Data/3.3/StringData.cs
r2684 r2694 64 64 65 65 #region IStringConvertibleData Members 66 bool IStringConvertibleData.Validate(string value) { 67 return true; 66 bool IStringConvertibleData.Validate(string value, out string errorMessage) { 67 if (value == null) { 68 errorMessage = "Invalid Value (string must not be null)"; 69 return false; 70 } else { 71 errorMessage = string.Empty; 72 return true; 73 } 68 74 } 69 75 string IStringConvertibleData.GetValue() { … … 71 77 } 72 78 bool IStringConvertibleData.SetValue(string value) { 73 Value = value != null ? value : string.Empty; 74 return true; 79 if (value != null) { 80 Value = value; 81 return true; 82 } else { 83 return false; 84 } 75 85 } 76 86 #endregion -
trunk/sources/HeuristicLab.Data/3.3/TimeSpanData.cs
r2684 r2694 42 42 43 43 #region IStringConvertibleData Members 44 bool IStringConvertibleData.Validate(string value) { 45 TimeSpan t; 46 return TimeSpan.TryParse(value, out t); 44 bool IStringConvertibleData.Validate(string value, out string errorMessage) { 45 TimeSpan val; 46 bool valid = TimeSpan.TryParse(value, out val); 47 errorMessage = string.Empty; 48 if (!valid) { 49 StringBuilder sb = new StringBuilder(); 50 sb.Append("Invalid Value (Valid Value Format: \""); 51 sb.Append(FormatPatterns.GetTimeSpanFormatPattern()); 52 sb.Append("\")"); 53 errorMessage = sb.ToString(); 54 } 55 return valid; 47 56 } 48 57 string IStringConvertibleData.GetValue() { … … 50 59 } 51 60 bool IStringConvertibleData.SetValue(string value) { 52 TimeSpan t;53 if (TimeSpan.TryParse(value, out t)) {54 Value = t;61 TimeSpan val; 62 if (TimeSpan.TryParse(value, out val)) { 63 Value = val; 55 64 return true; 56 65 } else { -
trunk/sources/HeuristicLab.Data/3.3/ValueTypeArrayData.cs
r2677 r2694 32 32 [Item("ValueTypeArrayData<T>", "A base class for representing arrays of value types.")] 33 33 public class ValueTypeArrayData<T> : Item, IEnumerable where T : struct { 34 [Storable] 34 35 private T[] array; 35 36 -
trunk/sources/HeuristicLab.Data/3.3/ValueTypeData.cs
r2669 r2694 31 31 public class ValueTypeData<T> : Item where T : struct { 32 32 [Storable] 33 pr otectedT value;33 private T value; 34 34 public T Value { 35 35 get { return value; } -
trunk/sources/HeuristicLab.Data/3.3/ValueTypeMatrixData.cs
r2677 r2694 32 32 [Item("ValueTypeMatrixData<T>", "A base class for representing matrices of value types.")] 33 33 public class ValueTypeMatrixData<T> : Item, IEnumerable where T : struct { 34 [Storable] 34 35 private T[,] array; 35 36
Note: See TracChangeset
for help on using the changeset viewer.