Changeset 17446 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs
- Timestamp:
- 02/20/20 16:58:03 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs
r17442 r17446 51 51 52 52 // extract metadata information 53 string optimizerName = instData.Template[Constants.Metadata][Constants.TemplateName].ToString();54 53 string hLFileLocation = Path.GetFullPath(instData.Template[Constants.Metadata][Constants.HLFileLocation].ToString()); 55 54 … … 78 77 79 78 #region Helper 80 81 private static object GetValueFromJObject(JObject obj) =>82 obj[nameof(IJsonItem.Value)]?.ToObject<object>();83 84 79 private static IEnumerable<string> CollectResults(InstData instData) { 85 80 IList<string> res = new List<string>(); … … 107 102 else old = tmp; 108 103 } 109 tmp.Value = GetValueFromJObject(obj); 110 tmp.Range = obj[nameof(IJsonItem.Range)]?.ToObject<object[]>(); 111 tmp.ActualName = obj[nameof(IJsonItem.ActualName)]?.ToString(); 104 tmp.SetFromJObject(obj); 112 105 instData.Objects.Add(tmp.Path, tmp); 113 106 } … … 120 113 // override default value 121 114 if (instData.Objects.TryGetValue(path, out IJsonItem param)) { 122 param.Value = GetValueFromJObject(obj); 123 // override ActualName (for LookupParameters) 124 if (param.ActualName != null) 125 param.ActualName = obj[nameof(IJsonItem.ActualName)]?.ToString(); 115 // save range from template 116 IEnumerable<object> tmpRange = param.Range; 117 param.SetFromJObject(obj); 118 // set range from template 119 param.Range = tmpRange; 126 120 } else throw new InvalidDataException($"No parameter with path='{path}' defined!"); 127 121 }
Note: See TracChangeset
for help on using the changeset viewer.