Changeset 17477 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App

Timestamp:

03/17/20 12:33:35 (4 years ago)

Author:

dpiringe

Message:

#3026:

• refactored JsonTemplateInstantiator -> now returns a InstantiatorResult which contains the optimizer and an IEnumerable of IResultJsonItem
• code cleanup in JCGenerator
• relocated the serialization of json items into IJsonItem with method GenerateJObject (virtual base implementation in JsonItem)
  • this allows custom serialization for json items (example: ValueLookupJsonItem)
  • items of interface IIntervalRestrictedJsonItem have a custom implementation of GenerateJObject -> hides Minimum and Maximum if the values are the physically min/max of their type
• code cleanup in BaseConverter

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Runner.cs (modified) (3 diffs)

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

@@ -16 +16 @@
   internal static class Runner {
     internal static void Run(string template, string config, string outputFile) {
-      IOptimizer optimizer = JsonTemplateInstantiator.Instantiate(template, config, out IEnumerable<string> allowedResultNames);
+      InstantiatorResult instantiatorResult = JsonTemplateInstantiator.Instantiate(template, config);
+      IOptimizer optimizer = instantiatorResult.Optimizer;
+      IEnumerable<IResultJsonItem> configuredResultItem = instantiatorResult.ConfiguredResultItems;
+
       optimizer.Runs.Clear();
       if(optimizer is EngineAlgorithm e)
@@ -23 +26 @@
       Task task = optimizer.StartAsync();
       while(!task.IsCompleted) {
-        WriteResultsToFile(outputFile, optimizer, allowedResultNames);
+        WriteResultsToFile(outputFile, optimizer, configuredResultItem);
         Thread.Sleep(100);
       }
      
-      WriteResultsToFile(outputFile, optimizer, allowedResultNames);
+      WriteResultsToFile(outputFile, optimizer, configuredResultItem);
     }
 
-    private static void WriteResultsToFile(string file, IOptimizer optimizer, IEnumerable<string> allowedResultNames) =>
-      File.WriteAllText(file, FetchResults(optimizer, allowedResultNames));
+    private static void WriteResultsToFile(string file, IOptimizer optimizer, IEnumerable<IResultJsonItem> configuredResultItem) =>
+      File.WriteAllText(file, FetchResults(optimizer, configuredResultItem));
 
-    private static string FetchResults(IOptimizer optimizer, IEnumerable<string> allowedResultNames) {
+    private static string FetchResults(IOptimizer optimizer, IEnumerable<IResultJsonItem> configuredResultItem) {
       JArray arr = new JArray();
-      
+      IEnumerable<string> configuredResults = configuredResultItem.Select(x => x.Name);
+
       foreach (var run in optimizer.Runs) {
         JObject obj = new JObject();
@@ -41 +45 @@
         obj.Add("Run", JToken.FromObject(run.ToString()));
         foreach (var res in run.Results) {
-          if (allowedResultNames.Contains(res.Key)) {
+          if (configuredResults.Contains(res.Key)) {
             if (res.Value is ISymbolicRegressionSolution solution) {
               var formatter = new SymbolicDataAnalysisExpressionMATLABFormatter();