Changeset 17353 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.cs

Timestamp:

11/19/19 16:33:01 (4 years ago)

Author:

dpiringe

Message:

#3026:

• relocated GetMaxValue and GetMinValue from ValueTypeValueConverter into BaseConverter
• fixed a bug in ConstrainedValueParameterConverter (from GetType().Name to ToString())
• printing now PrettyNames for types
• added comments
• added StorableConverter.cs (not finished, maybe not a good converter)
• added ValueRangeConverter.cs for DoubleRange and IntRange
• added ParameterConverter.cs for default parameter conversion

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.cs (modified) (9 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -9 +10 @@
 
 namespace HeuristicLab.JsonInterface {
+  /// <summary>
+  /// Static class to generate json interface templates.
+  /// </summary>
   public static class JCGenerator {
-
     private struct GenData {
       public JObject Template { get; set; }
@@ -16 +19 @@
       public JArray JsonItems { get; set; }
     }
-
-
+    
     public static string GenerateTemplate(IAlgorithm algorithm) {
       // data container
@@ -30 +32 @@
       // which have parameters aswell
       AddInstantiableIItem(Constants.Algorithm, algorithm, genData);
-      IsConvertable(algorithm, true);
-      if (algorithm.Problem != null && IsConvertable(algorithm.Problem, true)) // 1.2. only when an problem exists
+      //IsConvertable(algorithm, true);
+      if (algorithm.Problem != null) // 1.2. only when an problem exists
         AddInstantiableIItem(Constants.Problem, algorithm.Problem, genData);
 
@@ -43 +45 @@
     
     #region Helper
-    private static bool IsConvertable(object obj, bool throwException) {
+    private static bool IsConvertable(object obj, bool throwException = false) {
       bool tmp = ConvertableAttribute.IsConvertable(obj);
       if (throwException && tmp)
-        throw new NotSupportedException($"Type {obj.GetType().Name} is not convertable!");
+        throw new NotSupportedException($"Type {obj.GetType().GetPrettyName(false)} is not convertable!");
       return tmp;
     }
+
     private static void AddInstantiableIItem(string metaDataTagName, IItem item, GenData genData) {
       JsonItem jsonItem = JsonItemConverter.Extract(item);
@@ -78 +81 @@
       obj.Property(nameof(JsonItem.Type))?.Remove();
 
-      genData.TypeList.Add(item.Path, item.Type);
+      if(!genData.TypeList.ContainsKey(item.Path))
+        genData.TypeList.Add(item.Path, item.Type);
       return obj;
     }
@@ -87 +91 @@
       TransformNodes(x => {
         var p = x.ToObject<JsonItem>();
+        x.Property(nameof(JsonItem.Type))?.Remove();
+        x.Property(nameof(JsonItem.Parameters))?.Remove();
+        /*
         if ((p.Value == null || (p.Value != null && p.Value.GetType() == typeof(string) && p.Range == null) && p.ActualName == null)) {
           objToRemove.Add(x);
@@ -92 +99 @@
           x.Property(nameof(JsonItem.Type))?.Remove();
           x.Property(nameof(JsonItem.Parameters))?.Remove();
-        }
+        }*/
       }, token[Constants.FreeParameters]);
-      foreach (var x in objToRemove) x.Remove();
+      //foreach (var x in objToRemove) x.Remove();
     }
 
@@ -109 +116 @@
         if (p.Value == null) objToRemove.Add(x); 
       }, token[Constants.StaticParameters]);
-      foreach (var x in objToRemove) x.Remove();
+      //foreach (var x in objToRemove) x.Remove();
     }