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

Timestamp:

02/17/20 15:13:17 (4 years ago)

Author:

dpiringe

Message:

#3026:

• fixed a bug in HeuristicLab.JsonInterface.App -> now the Runner checks if the instantiated optimizer is an EngineAlgorithm, if true: Engine = SequentialEngine (engine can be configured in later versions)
• added a TabControl in ExportJsonDialog for parameters and results
• updated parameter tree view with checkboxes (and linked them with VM)
• renamed ActivatedResults to Results for templates
• fixed a bug with injection of operators in MultiCheckedOperatorConverter -> now operators of an ValueParameter get set correctly
• updated MultiCheckedOperatorConverter to extract/inject parameters of operators
• fixed bug with path for template -> removed usage of method Path.GetDirectoryName, returned wrong results
• splitted cache for JsonItemConverter into a cache for injection and extraction
• JsonTemplateInstantiator now uses first item in objects array instead of searching for an object with template name

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App

Files:

• HeuristicLab.JsonInterface.App.csproj (modified) (1 diff)
• Runner.cs (modified) (2 diffs)

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

@@ -83 +83 @@
       <Name>HeuristicLab.Problems.Instances-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.SequentialEngine\3.3\HeuristicLab.SequentialEngine-3.3.csproj">
+      <Project>{DC3D7072-7999-4719-B65D-3997744D5DC1}</Project>
+      <Name>HeuristicLab.SequentialEngine-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup />

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

@@ -7 +7 @@
 using System.Threading.Tasks;
 using HeuristicLab.Optimization;
+using HeuristicLab.SequentialEngine;
 
 namespace HeuristicLab.JsonInterface.App {
@@ -12 +13 @@
     internal static void Run(string template, string config, string outputFile = @"C:\Workspace\test.txt") {
       IOptimizer optimizer = JsonTemplateInstantiator.Instantiate(template, config);
-  
+      if(optimizer is EngineAlgorithm e)
+        e.Engine = new SequentialEngine.SequentialEngine();
+      
       Task task = optimizer.StartAsync();
       while(!task.IsCompleted) {