Changeset 17371

Timestamp:

11/26/19 13:27:23 (5 years ago)

Author:

dpiringe

Message:

#3026:

• added new Converters:
  • CheckedItemListConverter
  • ItemCollectionConverter
  • PrimitiveConverter: not implemented yet
  • ConfigurableConverter: maybe this converter can replace all others
• added program for testing -> HeuristicLab.ConfigStarter
• added the option to register converter with an attic guid

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab.JsonInterface/Converters/BaseConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/CheckedItemListConverter.cs (added)
• HeuristicLab.JsonInterface/Converters/ConfigurableConverter.cs (added)
• HeuristicLab.JsonInterface/Converters/ItemCollectionConverter.cs (added)
• HeuristicLab.JsonInterface/Converters/PrimitiveConverter.cs (added)
• HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj (modified) (1 diff)
• HeuristicLab.JsonInterface/JsonItem.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/JsonItemConverter.cs (modified) (4 diffs)
• Heuristiclab.ConfigStarter (added)
• Heuristiclab.ConfigStarter/HeuristicLab.snk (added)
• Heuristiclab.ConfigStarter/Heuristiclab.ConfigStarter.csproj (added)
• Heuristiclab.ConfigStarter/Plugin.cs.frame (added)
• Heuristiclab.ConfigStarter/Program.cs (added)
• Heuristiclab.ConfigStarter/Properties (added)
• Heuristiclab.ConfigStarter/Properties/AssemblyInfo.cs (added)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/BaseConverter.cs

@@ -86 +86 @@
 
     protected object GetDefaultValue(Type t) => t.IsValueType ? Activator.CreateInstance(t) : null;
+
+    
+
     #endregion
   }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj

@@ -63 +63 @@
     <Compile Include="Attributes\ConvertableAttribute.cs" />
     <Compile Include="Constants.cs" />
+    <Compile Include="Converters\CheckedItemListConverter.cs" />
+    <Compile Include="Converters\ConfigurableConverter.cs" />
+    <Compile Include="Converters\ItemCollectionConverter.cs" />
     <Compile Include="Converters\ParameterConverter.cs" />
+    <Compile Include="Converters\PrimitiveConverter.cs" />
     <Compile Include="Converters\StorableConverter.cs" />
     <Compile Include="Converters\ValueLookupParameterConverter.cs" />

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

@@ -133 +133 @@
     public static JsonItem BuildJsonItem(JObject obj, IDictionary<string, string> typeList) {
       object val = obj[nameof(Value)]?.ToObject<object>();
-      if (val is JContainer)
-        val = ((JContainer)val).ToObject<object[]>();
+      if (val is JContainer) {
+        //try {
+          val = ((JContainer)val).ToObject<object[]>();
+        /*} catch (Exception) { }
+        try {
+          val = ((JContainer)val).ToObject<object[,]>();
+        } catch (Exception) { }*/
+      }
+        
 
       return new JsonItem() {

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

@@ -6 +6 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.PluginInfrastructure;
+using HEAL.Attic;
+using System.Collections;
 
 namespace HeuristicLab.JsonInterface {
@@ -30 +33 @@
       if (!Converters.ContainsKey(type))
         Converters.Add(type, new ConverterPriorityContainer() { Converter = converter, Priority = priority });
+    }
+
+
+    public static void Register(string atticGuid, IJsonItemConverter converter, int priority) =>
+      Register(new Guid(atticGuid), converter, priority);
+
+    public static void Register(Guid atticGuid, IJsonItemConverter converter, int priority) {
+      if (Mapper.StaticCache.TryGetType(atticGuid, out Type type)) {
+        Register(type, converter, priority);
+      }
     }
 
@@ -68 +81 @@
         return best.Converter;
       }
+
+      Type t = Mapper.StaticCache.GetType(new Guid("25137f88-66b9-48d7-a2bd-60190082e044"));
+
+      
+
       return new DummyConverter();
     }
@@ -113 +131 @@
       Register(typeof(IConstrainedValueParameter<>), new ConstrainedValueParameterConverter(), 3);
       Register(typeof(ICheckedMultiOperator<>), new MultiCheckedOperatorConverter(), 3);
+
+      //ApplicationManager.Manager
+      // "25137f88-66b9-48d7-a2bd-60190082e044"
+      //new Guid("25137f88-66b9-48d7-a2bd-60190082e044")
+      // ISymbol
+
+      Register("25137f88-66b9-48d7-a2bd-60190082e044", 
+        new ConfigurableConverter()
+        .Primitive("InitialFrequency", ElementType.Property, new object[] { 0.0, 1.0 })
+        .Primitive("Enabled", ElementType.Property, true)
+        .Primitive("MinimumArity", ElementType.Property, 0)
+        .Primitive("MaximumArity", ElementType.Property, 10),
+        5);
+
+      // Dataset
+      Register("49F4D145-50D7-4497-8D8A-D190CD556CC8",
+        new ConfigurableConverter() //TODO: set guid to enable inheritance?
+        /*.PrimitiveEnumerable("VariableNames", ElementType.Property)
+        .PrimitiveEnumerable("DoubleVariables", ElementType.Property)
+        .PrimitiveEnumerable("StringVariables", ElementType.Property)
+        .PrimitiveEnumerable("DateTimeVariables", ElementType.Property)*/
+        .PrimitiveEnumerable("storableData", ElementType.Field, new double[,] { }),
+        5);
+
+      // ICheckedItemList<>
+      Register("ba4a82ca-92eb-47a1-95a7-f41f6ef470f4",
+        new ConfigurableConverter()
+        .This((o,t) => {
+          dynamic itemList = o as dynamic;
+          IList<JsonItem> jsonItems = new List<JsonItem>();
+          int count = 0;
+          foreach(var obj in itemList) {
+            IItem item = obj as IItem;
+            JsonItem checkedStatus = new JsonItem() {
+              Name = "Checked",
+              Value = itemList.ItemChecked(obj),
+              Range = new object[] { false, true }
+            };
+            JsonItem value = Extract(item);
+
+            jsonItems.Add(new JsonItem() {
+              Name = item.ItemName + count++,
+              Parameters = new JsonItem[] {
+                checkedStatus, value
+              },
+              Type = item.GetType().AssemblyQualifiedName
+            });
+          }
+          return jsonItems;
+        }),
+        5);
     }
   }