Changeset 18039 for branches

Timestamp:

08/03/21 10:53:47 (3 years ago)

Author:

dpiringe

Message:

#3026

• fixed the possibility for duplicated result entries in template generation
• added a check for duplicated result entries in Runner to prevent an Key already exists exception (a user could manually manipulate the template file to generate this type of exception, thats the reason for a second check)
• fixed the relative to absolute path transformation in JsonTemplateInstantiator

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab.JsonInterface.App/Runner.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/AlgorithmConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs (modified) (2 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Runner.cs

@@ -66 +66 @@
         foreach(var result in filteredResults) {
           var formatter = GetResultFormatter(result.Item1.ResultFormatterType);
-          obj.Add(result.Item1.Name, formatter.Format(result.Item2));
+          if(!obj.ContainsKey(result.Item1.Name)) // to prevent duplicates
+            obj.Add(result.Item1.Name, formatter.Format(result.Item2));
         }
       }

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

@@ -28 +28 @@
       IAlgorithm algorithm = value as IAlgorithm;
       foreach (var res in algorithm.Results) {
-        item.AddChildren(root.Extract(res, root));
-        /*
-        item.AddChildren(new ResultJsonItem() {
-          Name = res.Name,
-          Description = res.Description
-        });*/
+        var resultItem = root.Extract(res, root);
+        // fetch all result parameter items
+        var resultParameterItems = 
+          item.Where(x => x
+          .GetType()
+          .GetInterfaces()
+          .Any(y => y == typeof(IResultJsonItem)));
+        // check for duplicates (to prevent double result items,
+        // which can occur with result parameters)
+        if(!resultParameterItems.Any(x => x.Name == resultItem.Name))
+          item.AddChildren(resultItem);
       }
       item.AddChildren(root.Extract(algorithm.Problem, root));

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

@@ -24 +24 @@
   /// </summary>
   public class JsonTemplateInstantiator {
+
+    #region Constants
+    private const string RelativePathCurrentDirectoryRegex = @"^(\.)";
+    #endregion
 
     #region Private Properties
@@ -52 +56 @@
 
       // extract metadata information
-      string relativePath = Template[Constants.Metadata][Constants.HLFileLocation].ToString(); // get relative path
+      string relativePath = Template[Constants.Metadata][Constants.HLFileLocation].ToString().Trim(); // get relative path
       // convert to absolute path
-      string hLFileLocation = Regex.Replace(relativePath, @"^(\.)", $"{Path.GetDirectoryName(templateFile)}");
+      if (Regex.IsMatch(relativePath, RelativePathCurrentDirectoryRegex))
+        relativePath = relativePath.Remove(0, 2); // remove first 2 chars -> indicates the current directory
+
+      string hLFileLocation = $"{Path.GetDirectoryName(templateFile)}{Path.DirectorySeparatorChar}{relativePath}";
 
       #region Deserialize HL File