Changeset 17453

Timestamp:

02/26/20 12:58:45 (5 years ago)

Author:

dpiringe

Message:

#3026:

• the runs of an optimizer gets cleared before starting it in HeuristicLab.JsonInterface.App.Runner now
• all runs of an optimizer gets cleared when exporting it with ExportJsonDialog
• fixed a bug in CommandLineArgumentHandling: now always returns a StringArgument when all conditions are false

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab.JsonInterface.App/HeuristicLab.JsonInterface.App.csproj (modified) (1 diff)
• HeuristicLab.JsonInterface.App/Runner.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/CommandLineArgumentHandling.cs (modified) (2 diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (1 diff)

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

@@ -89 +89 @@
       <Name>HeuristicLab.Optimization-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.ParallelEngine\3.3\HeuristicLab.ParallelEngine-3.3.csproj">
+      <Project>{00814351-4AB8-4088-9B99-F62787B89E93}</Project>
+      <Name>HeuristicLab.ParallelEngine-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>

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

@@ -7 +7 @@
 using System.Threading.Tasks;
 using HeuristicLab.Optimization;
+using HeuristicLab.ParallelEngine;
 using HeuristicLab.SequentialEngine;
 using Newtonsoft.Json.Linq;
@@ -14 +15 @@
     internal static void Run(string template, string config, string outputFile) {
       IOptimizer optimizer = JsonTemplateInstantiator.Instantiate(template, config, out IEnumerable<string> allowedResultNames);
+      optimizer.Runs.Clear();
       if(optimizer is EngineAlgorithm e)
-        e.Engine = new SequentialEngine.SequentialEngine();
+        e.Engine = new ParallelEngine.ParallelEngine();
       
       Task task = optimizer.StartAsync();

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.cs

@@ -65 +65 @@
       // to set default value for disabled items
       JsonItemConverter.Inject(Optimizer, Root);
-      /*
-      foreach (var x in VMs) {
-        if (!x.Selected) {
-          x.Item.Parent?.Children?.Remove(x.Item);
-        } else if(x is ResultItemVM) {
-          x.Item.Parent?.Children?.Remove(x.Item);
-          Root.AddChildren(x.Item);
-        }
-      }
-      */
+
+      // clear all runs
+      Optimizer.Runs.Clear();
       
       IList<IJsonItem> faultyItems = new List<IJsonItem>();

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

@@ -45 +45 @@
       var regex = new Regex(@"^/[A-Za-z]+(:\w[\w\s]*)?$");
       bool isFile = File.Exists(entry);
-      if (!regex.IsMatch(entry) && !isFile) return null;
+      if (!regex.IsMatch(entry) && !isFile) return new StringArgument(entry);
       if (!isFile) {
+        var stringArgumentFallback = new StringArgument(entry);
         entry = entry.Remove(0, 1);
         var parts = entry.Split(':');
@@ -54 +55 @@
           case StartArgument.TOKEN: return new StartArgument(value);
           case HideStarterArgument.TOKEN: return new HideStarterArgument(value);
-          default: return new StringArgument(value);
+          default: return stringArgumentFallback;
         }
       } else return new OpenArgument(entry);

branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -304 +304 @@
         BestTSPSolutionAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
         BestTSPSolutionAnalyzer.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
-        BestTSPSolutionAnalyzer.ResultsParameter.ActualName = "Results";
+        //BestTSPSolutionAnalyzer.ResultsParameter.ActualName = "Results";
         BestTSPSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
         BestTSPSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;