Changeset 18045 for branches/3026_IntegrationIntoSymSpace

Timestamp:

08/31/21 15:43:06 (3 years ago)

Author:

dpiringe

Message:

#3026

• code cleanup
• fixed a bug in ValueParameterConverter which prevented successful injection
• changed error handling in method Main.HeadlessRun and Runner.Run

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab.JsonInterface.App/Runner.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ParameterizedItemConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/RegressionProblemDataConverter.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface/Converters/ValueLookupParameterConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ValueParameterConverter.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/Main.cs (modified) (1 diff)
• HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified) (2 diffs)

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

@@ -12 +12 @@
   internal static class Runner {
     internal static void Run(string template, string config, string outputFile) {
-      try {
-        InstantiatorResult instantiatorResult = JsonTemplateInstantiator.Instantiate(template, config);
-        IOptimizer optimizer = instantiatorResult.Optimizer;
-        IEnumerable<IResultJsonItem> configuredResultItem = instantiatorResult.ConfiguredResultItems;
+      InstantiatorResult instantiatorResult = JsonTemplateInstantiator.Instantiate(template, config);
+      IOptimizer optimizer = instantiatorResult.Optimizer;
+      IEnumerable<IResultJsonItem> configuredResultItem = instantiatorResult.ConfiguredResultItems;
 
-        optimizer.Runs.Clear();
-        if (optimizer is EngineAlgorithm e)
-          e.Engine = new ParallelEngine.ParallelEngine();
+      optimizer.Runs.Clear();
+      if (optimizer is EngineAlgorithm e)
+        e.Engine = new ParallelEngine.ParallelEngine();
 
-        Task task = optimizer.StartAsync();
-        while (!task.IsCompleted) {
-          WriteResultsToFile(outputFile, optimizer, configuredResultItem);
-          Thread.Sleep(100);
-        }
+      Task task = optimizer.StartAsync();
+      while (!task.IsCompleted) {
+        WriteResultsToFile(outputFile, optimizer, configuredResultItem);
+        Thread.Sleep(100);
+      }
 
-        WriteResultsToFile(outputFile, optimizer, configuredResultItem);
-      } catch (Exception e) {
-        Console.Error.WriteLine($"{e.Message} \n\n\n\n {e.StackTrace}");
-        File.WriteAllText(outputFile, e.Message + "\n\n\n\n" + e.StackTrace);
-        Environment.Exit(-1);
-      }
+      WriteResultsToFile(outputFile, optimizer, configuredResultItem);
     }
 

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

@@ -11 +11 @@
 
     public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) {
-      IParameterizedItem pItem = item as IParameterizedItem;
+      var pItem = item as IParameterizedItem;
 
       if(data.Children != null) {

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

@@ -43 +43 @@
       StringArrayJsonItem allowedInputVariables = null;
 
-
       // search first for the items (cache them, because the 
       // order is important for injection)
       foreach (var child in data.Children) {
-
         if (child.Path.EndsWith(Dataset))
           dataset = child as DoubleMatrixJsonItem;
@@ -58 +56 @@
         else if (child.Path.EndsWith(AllowedInputVariables))
           allowedInputVariables = child as StringArrayJsonItem;
-
       }
 

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

@@ -20 +20 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) {
       IValueLookupParameter param = value as IValueLookupParameter;
-
       IValueLookupJsonItem item = new ValueLookupJsonItem();
 

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

@@ -13 +13 @@
       IParameter parameter = value as IParameter;
 
-      if (!(data is EmptyJsonItem)) {
-        if (parameter.ActualValue == null)
-          parameter.ActualValue = Instantiate(parameter.DataType);
-        root.Inject(parameter.ActualValue, data, root);
-      }
+      if (parameter.ActualValue == null)
+        parameter.ActualValue = Instantiate(parameter.DataType);
+      root.Inject(parameter.ActualValue, data, root);
     }
 

branches/3026_IntegrationIntoSymSpace/HeuristicLab.PluginInfrastructure/3.3/Main.cs

@@ -56 +56 @@
 
     public static void HeadlessRun(string[] args) {
-      string pluginPath = Path.GetFullPath(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location));
-      var pluginManager = new PluginManager(pluginPath);
-      pluginManager.DiscoverAndCheckPlugins();
+      try {
+        string pluginPath = Path.GetFullPath(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location));
+        var pluginManager = new PluginManager(pluginPath);
+        pluginManager.DiscoverAndCheckPlugins();
 
-      var arguments = CommandLineArgumentHandling.GetArguments(args);
-      foreach (var argument in arguments) {
-        if (argument is StartArgument) {
-          var arg = (StartArgument)argument;
-          var appDesc = (from desc in pluginManager.Applications
-                         where desc.Name.Equals(arg.Value)
-                         select desc).SingleOrDefault();
-          if (appDesc != null) {
-            try {
+        var arguments = CommandLineArgumentHandling.GetArguments(args);
+        foreach (var argument in arguments) {
+          if (argument is StartArgument) {
+            var arg = (StartArgument)argument;
+            var appDesc = (from desc in pluginManager.Applications
+                           where desc.Name.Equals(arg.Value)
+                           select desc).SingleOrDefault();
+            if (appDesc != null) {
               pluginManager.Run(appDesc, arguments);
-            } catch (Exception e) {
-              Console.WriteLine(e.Message);
             }
           }
         }
+      } catch (Exception e) {
+        Console.Error.WriteLine($"{e.Message} \n\n {e.StackTrace}");
+        Environment.Exit(-1);
       }
     }

branches/3026_IntegrationIntoSymSpace/HeuristicLab/3.3/HeuristicLab-3.3.csproj

@@ -23 +23 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -35 +38 @@
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">