Changeset 17828 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateGenerator.cs

Timestamp:

02/01/21 14:37:18 (4 years ago)

Author:

dpiringe

Message:

#3026

• removed the option to set the value for JsonItems via exporter
  • reworked some base controls
  • added new controls for JsonItem specific properties (e.g. ArrayResizable)
  • deleted a lot of obsolet controls
• removed the Enable checkbox in the detail view of JsonItems
• exporter now clones the IOptimizer object
• added a check + message for unsupported exports
• list of JsonItems now includes unsupported JsonItems (disabled and marked with 'unsupported')
• refactored the converter type check
  • now every converter has to specify its supported type(s)

File:

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

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

@@ -12 +12 @@
   public class JsonTemplateGenerator {
 
-    public static void GenerateTemplate(string path, IOptimizer optimizer) =>
-      GenerateTemplate(path, optimizer.Name, optimizer);
+    /// <summary>
+    /// static Function to generate a template.
+    /// </summary>
+    /// <param name="templatePath">the path for the template files</param>
+    /// <param name="optimizer">the optimizer object to serialize</param>
+    /// <param name="rootItem">Root JsonItem for serialization, considers only active JsonItems for serialization</param>
+    public static void GenerateTemplate(string templatePath, IOptimizer optimizer, IJsonItem rootItem) {
+      // clear all runs
+      optimizer.Runs.Clear();
 
-    public static void GenerateTemplate(string path, string templateName, IOptimizer optimizer) =>
-      GenerateTemplate(path, templateName, optimizer, JsonItemConverter.Extract(optimizer));
+      // validation
+      ValidationResult validationResult = rootItem.GetValidator().Validate();
+      if (!validationResult.Success)
+        throw validationResult.GenerateException();
 
-    public static void GenerateTemplate(string path, string templateName, IOptimizer optimizer, IJsonItem rootItem) {
       #region Init
       JObject template = JObject.Parse(Constants.Template);
@@ -24 +32 @@
       JArray resultItems = new JArray();
       IList<IJsonItem> jsonItems = new List<IJsonItem>();
-      string fullPath = Path.GetFullPath(path);
+      string templateName = Path.GetFileName(templatePath);
+      string templateDirectory = Path.GetDirectoryName(templatePath);
+
       #endregion
 
@@ -35 +45 @@
       #region Serialize HL File
       ProtoBufSerializer serializer = new ProtoBufSerializer();
-      string hlFilePath = Path.Combine(fullPath, templateName + ".hl");
+      string hlFilePath = Path.Combine(templateDirectory, $"{templateName}.hl");
       serializer.Serialize(optimizer, hlFilePath);
       #endregion
@@ -56 +66 @@
 
       #region Serialize and write to file
-      File.WriteAllText(fullPath + @"\" + templateName + ".json", SingleLineArrayJsonWriter.Serialize(template));
+      File.WriteAllText(Path.Combine(templateDirectory, $"{templateName}.json"), SingleLineArrayJsonWriter.Serialize(template));
       #endregion
     }