Changeset 18041 for branches/3026_IntegrationIntoSymSpace

Timestamp:

08/06/21 16:16:21 (3 years ago)

Author:

dpiringe

Message:

#3026

• added PythonResultFormatter
• removed code which was used for debugging and was forgotten
• fixed the release build path of all JsonInterface projects
• changed the output of Runner -> now: it writes the results after (at least) one run is finished

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab 3.3.sln (modified) (2 diffs)
• HeuristicLab.JsonInterface.App/HeuristicLab.JsonInterface.App.csproj (modified) (2 diffs)
• HeuristicLab.JsonInterface.App/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.JsonInterface.App/Runner.cs (modified) (1 diff)
• HeuristicLab.JsonInterface.OptimizerIntegration/HeuristicLab.JsonInterface.OptimizerIntegration.csproj (modified) (1 diff)
• HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj (modified) (3 diffs)
• HeuristicLab.JsonInterface/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.JsonInterface/ResultFormatters/PythonResultFormatter.cs (added)
• HeuristicLab/3.3/Program.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab 3.3.sln

@@ -76 +76 @@
     {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E} = {3FC7515E-D8A0-41FE-8CFA-50E3ADA61A1E}
     {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0} = {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}
+    {0E3AAB5E-F152-44E0-A054-4D9A83ECEE08} = {0E3AAB5E-F152-44E0-A054-4D9A83ECEE08}
     {E10F395F-C8A6-48AD-B470-9AA7A1F43809} = {E10F395F-C8A6-48AD-B470-9AA7A1F43809}
+    {039D995F-1AA5-4461-92B3-B466F612D998} = {039D995F-1AA5-4461-92B3-B466F612D998}
     {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E} = {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}
     {0C378762-D5DB-488A-8931-2BA42B1B7CBF} = {0C378762-D5DB-488A-8931-2BA42B1B7CBF}
@@ -163 +165 @@
     {02CDDBF5-42A7-4C40-AE6C-E5D29AC9CCEC} = {02CDDBF5-42A7-4C40-AE6C-E5D29AC9CCEC}
     {6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5} = {6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5}
+    {5A3413F8-0928-4167-80E7-AAD9D6E38A94} = {5A3413F8-0928-4167-80E7-AAD9D6E38A94}
     {EE07BFF8-B23D-41F5-8AD7-AC9598D7A2C9} = {EE07BFF8-B23D-41F5-8AD7-AC9598D7A2C9}
     {E4EE5AFB-D552-447B-8A16-6CBE7938AF32} = {E4EE5AFB-D552-447B-8A16-6CBE7938AF32}

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

@@ -26 +26 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -127 +127 @@
       <Private>False</Private>
     </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>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Plugin.cs.frame

@@ -32 +32 @@
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.ParallelEngine", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
   public class HeuristicLabJsonInterfaceAppPlugin : PluginBase {
   }

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

@@ -35 +35 @@
     }
 
-    private static void WriteResultsToFile(string file, IOptimizer optimizer, IEnumerable<IResultJsonItem> configuredResultItem) =>
-      File.WriteAllText(file, FetchResults(optimizer, configuredResultItem));
+    private static void WriteResultsToFile(string file, IOptimizer optimizer, IEnumerable<IResultJsonItem> configuredResultItem) {
+      if (optimizer.Runs.Count > 0) 
+        File.WriteAllText(file, FetchResults(optimizer, configuredResultItem));
+    }
+      
 
     private static IEnumerable<IResultFormatter> ResultFormatter { get; } =

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

@@ -26 +26 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>

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

@@ -29 +29 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -104 +104 @@
     <Compile Include="JsonItems\ValueLookupJsonItem.cs" />
     <Compile Include="ResultFormatters\MatlabResultFormatter.cs" />
+    <Compile Include="ResultFormatters\PythonResultFormatter.cs" />
     <Compile Include="ResultFormatters\ResultFormatter.cs" />
     <Compile Include="ResultFormatters\StringResultFormatter.cs" />
@@ -181 +182 @@
       <Name>HeuristicLab.Problems.Instances.DataAnalysis-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/Plugin.cs.frame

@@ -33 +33 @@
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
-  [PluginDependency("HeuristicLab.SequentialEngine", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]

branches/3026_IntegrationIntoSymSpace/HeuristicLab/3.3/Program.cs

@@ -29 +29 @@
     static void Main(string[] args) {
       if ((args.Length >= 1) && (args[0] == "/start:JsonInterface")) {
-        try {
-          HeuristicLab.PluginInfrastructure.Main.HeadlessRun(args);
-        } catch (Exception e) {
-          File.WriteAllText(@"C:\Users\David\Desktop\GP_JsonInterface_Example\log.txt", e.Message);
-        }
-        File.WriteAllText(@"C:\Users\David\Desktop\GP_JsonInterface_Example\done.txt", Path.GetDirectoryName(Assembly.GetEntryAssembly().Location));
+        HeuristicLab.PluginInfrastructure.Main.HeadlessRun(args);
       } else {
         HeuristicLab.PluginInfrastructure.Main.Run(args);