Changeset 17395

Timestamp:

01/07/20 17:19:05 (5 years ago)

Author:

dpiringe

Message:

#3026:

• moved from usage of IAlgorithm to IOptimizer (in JCGenerator and JsonTemplateInstantiator)
• added new converter: AlgorithmConverter

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab.JsonInterface.App/Runner.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Constants.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface/Converters/AlgorithmConverter.cs (added)
• HeuristicLab.JsonInterface/Converters/BaseConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj (modified) (1 diff)
• HeuristicLab.JsonInterface/JCGenerator.cs (modified) (3 diffs)
• HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs (modified) (3 diffs)

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

@@ -11 +11 @@
   internal static class Runner {
     internal static void Run(string template, string config, string outputFile = @"C:\Workspace\test.txt") {
-      IAlgorithm alg = JsonTemplateInstantiator.Instantiate(template, config);
+      IOptimizer optimizer = JsonTemplateInstantiator.Instantiate(template, config);
   
-      Task task = alg.StartAsync();
+      Task task = optimizer.StartAsync();
       while(!task.IsCompleted) {
-        WriteResultsToFile(outputFile, alg);
+        WriteResultsToFile(outputFile, optimizer);
         Thread.Sleep(100);
       }
-      WriteResultsToFile(outputFile, alg);
+      WriteResultsToFile(outputFile, optimizer);
     }
 
-    private static void WriteResultsToFile(string file, IAlgorithm optimizer) =>
+    private static void WriteResultsToFile(string file, IOptimizer optimizer) =>
       File.WriteAllText(file, FetchResults(optimizer));
 
-    private static string FetchResults(IAlgorithm optimizer) {
+    private static string FetchResults(IOptimizer optimizer) {
       StringBuilder sb = new StringBuilder();
-      //foreach (var run in optimizer.Runs) {
-        //sb.AppendLine($"--- {run.ToString()} ---");
-        foreach (var res in optimizer.Results) {
-          sb.AppendLine($"{res.Name}: {res.Value}");
+      foreach (var run in optimizer.Runs) {
+        sb.AppendLine($"--- {run.ToString()} ---");
+        foreach (var res in run.Results) {
+          sb.AppendLine($"{res.Key}: {res.Value}");
         }
-      //}
+      }
       return sb.ToString();
     }

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

@@ -12 +12 @@
 
     internal const string Metadata = "Metadata";
-    internal const string Algorithm = "Algorithm";
+    internal const string Optimizer = "Optimizer";
     internal const string Problem = "Problem";
     internal const string HLFileLocation = "HLFileLocation";
@@ -19 +19 @@
     internal const string Template = @"{
       '" + Metadata + @"': {
-        '" + Algorithm + @"':'',
+        '" + Optimizer + @"':'',
         '" + Problem + @"':'',
         '" + HLFileLocation + @"':''

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

@@ -26 +26 @@
     
     public abstract void InjectData(IItem item, JsonItem data, IJsonItemConverter root);
-    public abstract void Populate(IItem value, JsonItem item, IJsonItemConverter root);
+    public abstract void Populate(IItem value, JsonItem item, IJsonItemConverter root); // TODO: populate?
 
     #region Helper

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

@@ -62 +62 @@
   <ItemGroup>
     <Compile Include="Constants.cs" />
+    <Compile Include="Converters\AlgorithmConverter.cs" />
     <Compile Include="Converters\RegressionProblemDataConverter.cs" />
     <Compile Include="Converters\ValueLookupParameterConverter.cs" />

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

@@ -20 +20 @@
     }
     
-    public static string GenerateTemplate(IAlgorithm algorithm) {
+    public static string GenerateTemplate(IOptimizer optimizer) {
       // data container
       GenData genData = new GenData() {
@@ -28 +28 @@
 
       ProtoBufSerializer serializer = new ProtoBufSerializer();
-      serializer.Serialize(algorithm, @"C:\Workspace\template.hl");
+      serializer.Serialize(optimizer, @"C:\Workspace\template.hl");
       genData.Template[Constants.Metadata][Constants.HLFileLocation] = @"C:\Workspace\template.hl";
 
@@ -34 +34 @@
       // template and save it an JArray incl. all parameters of the JsonItem, 
       // which have parameters aswell
-      AddInstantiableIItem(Constants.Algorithm, algorithm, genData);
-      if (algorithm.Problem != null) // only when an problem exists
-        AddInstantiableIItem(Constants.Problem, algorithm.Problem, genData);
+      AddInstantiableIItem(Constants.Optimizer, optimizer, genData);
 
       // save the JArray with JsonItems (= IParameterizedItems)

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

@@ -29 +29 @@
     /// <param name="templateFile">Template file (json), generated with JCGenerator.</param>
     /// <param name="configFile">Config file (json) for the template.</param>
-    /// <returns>confugrated IAlgorithm object</returns>
-    public static IAlgorithm Instantiate(string templateFile, string configFile = "") {
+    /// <returns>confugrated IOptimizer object</returns>
+    public static IOptimizer Instantiate(string templateFile, string configFile = "") {
       InstData instData = new InstData() {
         Objects = new Dictionary<string, JsonItem>()
@@ -41 +41 @@
 
       // extract metadata information
-      string algorithmName = instData.Template[Constants.Metadata][Constants.Algorithm].ToString();
-      string problemName = instData.Template[Constants.Metadata][Constants.Problem].ToString();
+      string optimizerName = instData.Template[Constants.Metadata][Constants.Optimizer].ToString();
       string hLFileLocation = instData.Template[Constants.Metadata][Constants.HLFileLocation].ToString();
 
       // deserialize hl file
       ProtoBufSerializer serializer = new ProtoBufSerializer();
-      IAlgorithm algorithm = (IAlgorithm)serializer.Deserialize(hLFileLocation);
+      IOptimizer optimizer = (IOptimizer)serializer.Deserialize(hLFileLocation);
 
       // collect all parameterizedItems from template
@@ -57 +56 @@
 
       // get algorthm data and object
-      JsonItem algorithmData = GetData(algorithmName, instData);
-
-      // get problem data and object
-      JsonItem problemData = GetData(problemName, instData);
+      JsonItem optimizerData = instData.Objects[optimizerName];
 
       // inject configuration
-      JsonItemConverter.Inject(algorithm, algorithmData);
-      if(algorithm.Problem != null)
-        JsonItemConverter.Inject(algorithm.Problem, problemData);
+      JsonItemConverter.Inject(optimizer, optimizerData);
 
-      return algorithm;
+      return optimizer;
     }