Changeset 17446 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface

Timestamp:

02/20/20 16:58:03 (5 years ago)

Author:

dpiringe

Message:

#3026:

• made interfaces for array/matrix JsonItems and for their VMs aswell (IArrayJsonItem, IArrayJsonItemVM, IMatrixJsonItem, IMatrixJsonItemVM), incl. base classes (ArrayJsonItemBase, ArrayValueVM, MatrixJsonItemBase, MatrixValueVM)
• changed inheritance structure for already existing array/matrix JsonItems -> they inherit now from new base array/matrix base classes
• added input elements to configure the size of an matrix or array in JsonItemMultiValueControl (incl. VM binding and validation)
• splitted file JsonItems.cs into separate files for their corresponding types (IntJsonItems.cs, DoubleJsonItems.cs, BoolJsonItems.cs, StringJsonItem.cs, DateTimeJsonItem.cs)
• changed location of deserialization of json values from JsonTemplateInstantiator into IJsonItem (implemented in JsonItem and set to virtual, overridden in MatrixJsonItemBase and ArrayJsonItemBase)
• added new CLI argument StringArgument
• some little UI improvements (location fixes, anchor fixes, ...)

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface

Files:

• Converters/ResultParameterConverter.cs (added)
• HeuristicLab.JsonInterface.csproj (modified) (1 diff)
• Interfaces/IArrayJsonItem.cs (added)
• Interfaces/IJsonItem.cs (modified) (2 diffs)
• Interfaces/IMatrixJsonItem.cs (added)
• JsonTemplateInstantiator.cs (modified) (4 diffs)
• Models/ArrayJsonItemBase.cs (added)
• Models/BoolJsonItems.cs (added)
• Models/DateTimeJsonItem.cs (added)
• Models/DoubleJsonItems.cs (added)
• Models/IntJsonItems.cs (added)
• Models/JsonItem.cs (modified) (2 diffs)
• Models/JsonItems.cs (deleted)
• Models/MatrixJsonItemBase.cs (added)
• Models/StringJsonItem.cs (added)

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

@@ -67 +67 @@
     <Compile Include="Converters\ValueLookupParameterConverter.cs" />
     <Compile Include="Converters\ValueRangeConverter.cs" />
+    <Compile Include="Interfaces\IArrayJsonItem.cs" />
     <Compile Include="Interfaces\IJsonItem.cs" />
     <Compile Include="Interfaces\IJsonItemValidator.cs" />
+    <Compile Include="Interfaces\IMatrixJsonItem.cs" />
+    <Compile Include="Models\ArrayJsonItemBase.cs" />
+    <Compile Include="Models\BoolJsonItems.cs" />
+    <Compile Include="Models\DateTimeJsonItem.cs" />
+    <Compile Include="Models\DoubleJsonItems.cs" />
     <Compile Include="Models\GenericJsonItem.cs" />
+    <Compile Include="Models\IntJsonItems.cs" />
     <Compile Include="Models\JsonItem.cs" />
-    <Compile Include="Models\JsonItems.cs" />
+    <Compile Include="Models\MatrixJsonItemBase.cs" />
     <Compile Include="Models\ResultItem.cs" />
+    <Compile Include="Models\StringJsonItem.cs" />
     <Compile Include="Models\UnsupportedJsonItem.cs" />
     <Compile Include="SingleLineArrayJsonWriter.cs" />

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItem.cs

@@ -5 +5 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {
@@ -45 +46 @@
     /// </summary>
     void LoosenPath();
+
+    void SetFromJObject(JObject jObject);
   }
 }

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

@@ -51 +51 @@
 
       // extract metadata information
-      string optimizerName = instData.Template[Constants.Metadata][Constants.TemplateName].ToString();
       string hLFileLocation = Path.GetFullPath(instData.Template[Constants.Metadata][Constants.HLFileLocation].ToString());
 
@@ -78 +77 @@
 
     #region Helper
-
-    private static object GetValueFromJObject(JObject obj) =>
-      obj[nameof(IJsonItem.Value)]?.ToObject<object>();
-
     private static IEnumerable<string> CollectResults(InstData instData) {
       IList<string> res = new List<string>();
@@ -107 +102 @@
           else old = tmp;
         }
-        tmp.Value = GetValueFromJObject(obj);
-        tmp.Range = obj[nameof(IJsonItem.Range)]?.ToObject<object[]>();
-        tmp.ActualName = obj[nameof(IJsonItem.ActualName)]?.ToString();
+        tmp.SetFromJObject(obj);
         instData.Objects.Add(tmp.Path, tmp);
       }
@@ -120 +113 @@
         // override default value
         if (instData.Objects.TryGetValue(path, out IJsonItem param)) {
-          param.Value = GetValueFromJObject(obj);
-          // override ActualName (for LookupParameters)
-          if (param.ActualName != null)
-            param.ActualName = obj[nameof(IJsonItem.ActualName)]?.ToString();
+          // save range from template
+          IEnumerable<object> tmpRange = param.Range;
+          param.SetFromJObject(obj);
+          // set range from template
+          param.Range = tmpRange; 
         } else throw new InvalidDataException($"No parameter with path='{path}' defined!");
       }

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

@@ -5 +5 @@
 using System.Text;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {
@@ -114 +115 @@
     public void FixatePath() => fixedPath = Path;
     public void LoosenPath() => fixedPath = "";
+
+    public virtual void SetFromJObject(JObject jObject) {
+      Value = jObject[nameof(IJsonItem.Value)]?.ToObject<object>();
+      Range = jObject[nameof(IJsonItem.Range)]?.ToObject<object[]>();
+      ActualName = jObject[nameof(IJsonItem.ActualName)]?.ToString();
+    }
     #endregion