Changeset 17439 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItemConverter.cs

Timestamp:

02/17/20 15:13:17 (4 years ago)

Author:

dpiringe

Message:

#3026:

• fixed a bug in HeuristicLab.JsonInterface.App -> now the Runner checks if the instantiated optimizer is an EngineAlgorithm, if true: Engine = SequentialEngine (engine can be configured in later versions)
• added a TabControl in ExportJsonDialog for parameters and results
• updated parameter tree view with checkboxes (and linked them with VM)
• renamed ActivatedResults to Results for templates
• fixed a bug with injection of operators in MultiCheckedOperatorConverter -> now operators of an ValueParameter get set correctly
• updated MultiCheckedOperatorConverter to extract/inject parameters of operators
• fixed bug with path for template -> removed usage of method Path.GetDirectoryName, returned wrong results
• splitted cache for JsonItemConverter into a cache for injection and extraction
• JsonTemplateInstantiator now uses first item in objects array instead of searching for an object with template name

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItemConverter.cs (modified) (4 diffs)

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

@@ -20 +20 @@
       = new Dictionary<Type, IJsonItemConverter>();
 
-    private IDictionary<int, IJsonItem> Cache { get; set; }
+    private IDictionary<int, IJsonItem> InjectCache { get; set; }
+      = new Dictionary<int, IJsonItem>();
+
+    private IDictionary<int, IJsonItem> ExtractCache { get; set; }
       = new Dictionary<int, IJsonItem>();
 
@@ -52 +55 @@
     
     public void Inject(IItem item, IJsonItem data, IJsonItemConverter root) {
-      if(item != null && !Cache.ContainsKey(item.GetHashCode())) {
+      if (item != null && !InjectCache.ContainsKey(item.GetHashCode())) {
         IJsonItemConverter converter = GetConverter(item.GetType());
         if(converter != null) converter.Inject(item, data, root);
+        InjectCache.Add(item.GetHashCode(), data);
       }
     }
@@ -60 +64 @@
     public IJsonItem Extract(IItem item, IJsonItemConverter root) {
       int hash = item.GetHashCode();
-      if (Cache.TryGetValue(hash, out IJsonItem val))
+      if (ExtractCache.TryGetValue(hash, out IJsonItem val))
         return val;
       else {
@@ -66 +70 @@
         if (converter == null) return new UnsupportedJsonItem();
         IJsonItem tmp = GetConverter(item.GetType()).Extract(item, root);
-        Cache.Add(hash, tmp);
+        ExtractCache.Add(hash, tmp);
         return tmp;
       }