Changeset 15032 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Views
- Timestamp:
- 06/12/17 14:11:43 (7 years ago)
- Location:
- branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Views
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Views/DataEditorView.cs
r14952 r15032 188 188 var type = Content.InputArgumentTypes[i]; 189 189 var offset = inputArgumentCountDict[type]; 190 row.Cells[i].Value = ViewHelper.StringifyInput(type, offset, example, ValueSeparator);190 row.Cells[i].Value = ViewHelper.StringifyInput(type, offset, "R", example, ValueSeparator); 191 191 inputArgumentCountDict[type]++; 192 192 } … … 196 196 var type = Content.OutputArgumentTypes[i]; 197 197 var offset = outputArgumentCountDict[type]; 198 row.Cells[Content.InputArgumentTypes.Length + i].Value = ViewHelper.StringifyOutput(type, offset, example, ValueSeparator);198 row.Cells[Content.InputArgumentTypes.Length + i].Value = ViewHelper.StringifyOutput(type, offset, "R", example, ValueSeparator); 199 199 outputArgumentCountDict[type]++; 200 200 } -
branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Views/ViewHelper.cs
r14952 r15032 6 6 7 7 public static class ViewHelper { 8 public static string StringifyInput(ExampleArgumentType type, int offset, Example example, string valueSeparator) {8 public static string StringifyInput(ExampleArgumentType type, int offset, string floatFormat, Example example, string valueSeparator) { 9 9 switch (type) { 10 10 case ExampleArgumentType.Integer: return example.InputInteger[offset].ToString(); 11 11 case ExampleArgumentType.IntegerVector: return "[" + string.Join(", ", example.InputIntegerVector[offset]) + "]"; 12 12 13 case ExampleArgumentType.Float: return example.InputFloat[offset].ToString( CultureInfo.CurrentUICulture);14 case ExampleArgumentType.FloatVector: return "[" + string.Join(", ", example.InputFloatVector[offset] ) + "]";13 case ExampleArgumentType.Float: return example.InputFloat[offset].ToString(floatFormat, CultureInfo.CurrentUICulture); 14 case ExampleArgumentType.FloatVector: return "[" + string.Join(", ", example.InputFloatVector[offset].Select(x => x.ToString(floatFormat, CultureInfo.InvariantCulture))) + "]"; 15 15 16 16 case ExampleArgumentType.Boolean: return example.InputBoolean[offset].ToString(); … … 24 24 } 25 25 26 public static string StringifyOutput(ExampleArgumentType type, int offset, Example example, string valueSeparator) {26 public static string StringifyOutput(ExampleArgumentType type, int offset, string floatFormat, Example example, string valueSeparator) { 27 27 switch (type) { 28 28 case ExampleArgumentType.Integer: return example.OutputInteger[offset].ToString(); 29 29 case ExampleArgumentType.IntegerVector: return "[" + string.Join(", ", example.OutputIntegerVector[offset]) + "]"; 30 30 31 case ExampleArgumentType.Float: return example.OutputFloat[offset].ToString( CultureInfo.CurrentUICulture);32 case ExampleArgumentType.FloatVector: return "[" + string.Join(", ", example.OutputFloatVector[offset] ) + "]";31 case ExampleArgumentType.Float: return example.OutputFloat[offset].ToString(floatFormat, CultureInfo.InvariantCulture); 32 case ExampleArgumentType.FloatVector: return "[" + string.Join(", ", example.OutputFloatVector[offset].Select(x => x.ToString(floatFormat, CultureInfo.InvariantCulture))) + "]"; 33 33 34 34 case ExampleArgumentType.Boolean: return example.OutputBoolean[offset].ToString();
Note: See TracChangeset
for help on using the changeset viewer.