Changeset 18040 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface

Timestamp:

08/04/21 17:19:05 (3 years ago)

Author:

dpiringe

Message:

#3026

• added some test cases for JsonInterface
• deleted the HeuristicLab namespace part in a lot of test classes (this caused a lot of compile errors)
• enhanced the OS path logic for absolute and relative path in JsonTemplateGenerator and JsonTemplateInstantiator
• fixed a bug in ValueParameterConverter -> the injection logic was not working correctly
• changed the folder determination in Main.cs for the HeadlessRun method
• added a new abstract type of JsonItem IntervalRestrictedJsonItem for JsonItems with a need of Minimum and Maximum bounds but without a specific value
  • changed in RangedJsonItem the base class from IntervalRestrictedValueJsonItem to IntervalRestrictedJsonItem

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface

Files:

• Converters/ValueParameterConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface.csproj (modified) (1 diff)
• JsonItems/IntervalRestrictedJsonItem.cs (added)
• JsonItems/IntervalRestrictedValueJsonItem.cs (modified) (1 diff)
• JsonItems/RangedJsonItem.cs (modified) (1 diff)
• JsonTemplateGenerator.cs (modified) (1 diff)
• JsonTemplateInstantiator.cs (modified) (2 diffs)

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

@@ -16 +16 @@
       IParameter parameter = value as IParameter;
 
-      if (parameter.ActualValue == null)
-        parameter.ActualValue = Instantiate(parameter.DataType);
-
-      if(parameter.ActualValue != null) {
-          if (data.Children == null || data.Children.Count() == 0)
-            root.Inject(parameter.ActualValue, data, root);
-          else
-            root.Inject(parameter.ActualValue, data, root);
-         
+      if (!(data is EmptyJsonItem)) {
+        if (parameter.ActualValue == null)
+          parameter.ActualValue = Instantiate(parameter.DataType);
+        root.Inject(parameter.ActualValue, data, root);
       }
     }

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

@@ -90 +90 @@
     <Compile Include="JsonItems\EmptyJsonItem.cs" />
     <Compile Include="JsonItems\IntervalRestrictedArrayJsonItem.cs" />
+    <Compile Include="JsonItems\IntervalRestrictedJsonItem.cs" />
     <Compile Include="JsonItems\IntervalRestrictedMatrixJsonItem.cs" />
     <Compile Include="JsonItems\IntervalRestrictedValueJsonItem.cs" />

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItems/IntervalRestrictedValueJsonItem.cs

@@ -3 +3 @@
 
 namespace HeuristicLab.JsonInterface {
-  public abstract class IntervalRestrictedValueJsonItem<T> : ValueJsonItem<T>, IIntervalRestrictedJsonItem<T>
+  public abstract class IntervalRestrictedValueJsonItem<T> : ValueJsonItem<T>, IIntervalRestrictedJsonItem<T> // TODO: intervalrestriction before value?
     where T : IComparable {
     public T Minimum { get; set; }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItems/RangedJsonItem.cs

@@ -4 +4 @@
 
 namespace HeuristicLab.JsonInterface {
-  public abstract class RangedJsonItem<T> : IntervalRestrictedValueJsonItem<T>, IRangedJsonItem<T>
+  public abstract class RangedJsonItem<T> : IntervalRestrictedJsonItem<T>, IRangedJsonItem<T>
     where T : IComparable {
     public T MinValue { get; set; }
+    
     public T MaxValue { get; set; }
 

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

@@ -50 +50 @@
       serializer.Serialize(optimizer, hlFilePath);
       // overwrite string for relative path
-      hlFilePath = Path.Combine($".{Path.DirectorySeparatorChar}", $"{templateName}.hl");
+      hlFilePath = Path.Combine($".", $"{templateName}.hl");
       #endregion
 

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

@@ -50 +50 @@
 
       #region Parse Files
+      string templateFileFullPath = Path.GetFullPath(templateFile);
       Template = JToken.Parse(File.ReadAllText(templateFile));
       if(!string.IsNullOrEmpty(configFile))
-        Config = JArray.Parse(File.ReadAllText(configFile));
+        Config = JArray.Parse(File.ReadAllText(Path.GetFullPath(configFile)));
       #endregion
 
@@ -61 +62 @@
         relativePath = relativePath.Remove(0, 2); // remove first 2 chars -> indicates the current directory
 
-      string hLFileLocation = $"{Path.GetDirectoryName(templateFile)}{Path.DirectorySeparatorChar}{relativePath}";
-
+      string hLFileLocation = Path.Combine(Path.GetDirectoryName(templateFileFullPath), relativePath);
       #region Deserialize HL File
       ProtoBufSerializer serializer = new ProtoBufSerializer();