- Timestamp:
- 01/20/20 16:36:05 (4 years ago)
- Location:
- branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/BaseConverter.cs
r17395 r17404 45 45 TypeCode typeCode = Type.GetTypeCode(t); 46 46 47 if (t ypeof(ValueType).IsEqualTo(typeof(PercentValue)))47 if (t.IsEqualTo(typeof(PercentValue))) 48 48 return 1.0d; 49 49 … … 67 67 TypeCode typeCode = Type.GetTypeCode(t); 68 68 69 if (t ypeof(ValueType).IsEqualTo(typeof(PercentValue)))69 if (t.IsEqualTo(typeof(PercentValue))) 70 70 return 0.0d; 71 71 -
branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ConstrainedValueParameterConverter.cs
r17394 r17404 46 46 if (x is IParameterizedItem) { 47 47 JsonItem tmp = JsonItemConverter.Extract(x); 48 list.Add(tmp); 48 if(!(tmp is UnsupportedJsonItem)) 49 list.Add(tmp); 49 50 } 50 51 } -
branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ParameterizedItemConverter.cs
r17394 r17404 25 25 26 26 foreach (var param in parameterizedItem.Parameters) { 27 if(!param.Hidden) 28 item.AddChilds(root.Extract(param, root)); 27 if (!param.Hidden) { 28 JsonItem tmp = root.Extract(param, root); 29 if(!(tmp is UnsupportedJsonItem)) 30 item.AddChilds(tmp); 31 } 32 29 33 } 30 34 } -
branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueParameterConverter.cs
r17394 r17404 21 21 if (value.ActualValue != null) { 22 22 JsonItem tmp = root.Extract(value.ActualValue, root); 23 if(tmp.Name == "[OverridableParamName]") { 24 tmp.Name = value.Name; 25 JsonItem.Merge(item, tmp); 23 if(!(tmp is UnsupportedJsonItem)) { 24 if (tmp.Name == "[OverridableParamName]") { 25 tmp.Name = value.Name; 26 JsonItem.Merge(item, tmp); 27 } else 28 item.AddChilds(tmp); 26 29 } 27 else28 item.AddChilds(tmp);29 30 } 30 31 }
Note: See TracChangeset
for help on using the changeset viewer.