Changeset 18030

Timestamp:

07/26/21 14:28:29 (3 years ago)

Author:

dpiringe

Message:

#3026

• added check for missing path property
• added functionality for relative .hl file paths

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface

Files:

• JsonTemplateGenerator.cs (modified) (2 diffs)
• JsonTemplateInstantiator.cs (modified) (3 diffs)

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

@@ -32 +32 @@
       JArray resultItems = new JArray();
       IList<IJsonItem> jsonItems = new List<IJsonItem>();
+     
       string templateName = Path.GetFileName(templatePath);
       string templateDirectory = Path.GetDirectoryName(templatePath);
@@ -45 +46 @@
       #region Serialize HL File
       ProtoBufSerializer serializer = new ProtoBufSerializer();
+      // get absolute path for serialization
       string hlFilePath = Path.Combine(templateDirectory, $"{templateName}.hl");
       serializer.Serialize(optimizer, hlFilePath);
+      // overwrite string for relative path
+      hlFilePath = Path.Combine($".{Path.DirectorySeparatorChar}", $"{templateName}.hl");
       #endregion
 

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

@@ -3 +3 @@
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using HEAL.Attic;
 using HeuristicLab.Optimization;
@@ -51 +52 @@
 
       // extract metadata information
-      string hLFileLocation = Path.GetFullPath(Template[Constants.Metadata][Constants.HLFileLocation].ToString());
+      string relativePath = Template[Constants.Metadata][Constants.HLFileLocation].ToString(); // get relative path
+      // convert to absolute path
+      string hLFileLocation = Regex.Replace(relativePath, @"^(\.)", $"{Path.GetDirectoryName(templateFile)}");
 
       #region Deserialize HL File
@@ -108 +111 @@
       foreach (JObject obj in Config) {
         // build item from config object
-        string path = obj.Property("Path").Value.ToString(); // TODO: catch exception if path is not available
+        var prop = obj.Property("Path");
+        if (prop == null) 
+          throw new ArgumentException("Path property is missing.");
+        string path = prop.Value.ToString();
         // override default value
         if (Objects.TryGetValue(path, out IJsonItem param)) {