Changeset 16102

Timestamp:

08/30/18 09:47:50 (6 years ago)

Author:

abeham

Message:

#2213: some pending changes exploring the topic

Location:

branches/2213_irace

Files:

• 2213_irace.sln (added)
• HeuristicLab.Integration.Irace (added)
• HeuristicLab.Integration.Irace/2.4 (added)
• HeuristicLab.Integration.Irace/2.4/HeuristicLab.Integration.Irace-2.4.csproj (added)
• HeuristicLab.Integration.Irace/2.4/HeuristicLab.snk (added)
• HeuristicLab.Integration.Irace/2.4/HiveTargetRunner.cs (added)
• HeuristicLab.Integration.Irace/2.4/Plugin.cs (added)
• HeuristicLab.Integration.Irace/2.4/Plugin.cs.frame (added)
• HeuristicLab.Integration.Irace/2.4/Properties (added)
• HeuristicLab.Integration.Irace/2.4/Properties/AssemblyInfo.cs (added)
• HeuristicLab.Integration.Irace/2.4/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/Arguments/SimpleArgument.cs (added)
• HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/CommandLineArgumentHandling.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/CrossDomainTracing.cs (added)
• HeuristicLab.PluginInfrastructure/3.3/HeuristicLab.PluginInfrastructure-3.3.csproj (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/Manager/PluginManager.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/Starter/SplashScreen.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/Starter/StarterForm.cs (modified) (2 diffs)

branches/2213_irace/HeuristicLab.PluginInfrastructure/3.3/CommandLineArgumentHandling/CommandLineArgumentHandling.cs

@@ -43 +43 @@
 
     private static ICommandLineArgument ParseArgument(string entry) {
-      var regex = new Regex(@"^/[A-Za-z]+(:\w[\w\s]*)?$");
+      var regex = new Regex(@"^/[A-Za-z]+(:[^/]*)?$");
       bool isFile = File.Exists(entry);
       if (!regex.IsMatch(entry) && !isFile) return null;
@@ -54 +54 @@
           case StartArgument.TOKEN: return new StartArgument(value);
           case HideStarterArgument.TOKEN: return new HideStarterArgument(value);
-          default: return null;
+          default: return new SimpleArgument(key, value);
         }
       } else return new OpenArgument(entry);

branches/2213_irace/HeuristicLab.PluginInfrastructure/3.3/HeuristicLab.PluginInfrastructure-3.3.csproj

@@ -222 +222 @@
     <Compile Include="CommandLineArgumentHandling\Arguments\OpenArgument.cs" />
     <Compile Include="CommandLineArgumentHandling\Arguments\HideStarterArgument.cs" />
+    <Compile Include="CommandLineArgumentHandling\Arguments\SimpleArgument.cs" />
     <Compile Include="CommandLineArgumentHandling\Arguments\StartArgument.cs" />
     <Compile Include="CommandLineArgumentHandling\CommandLineArgument.cs" />
@@ -234 +235 @@
     <Compile Include="BaseClasses\ApplicationBase.cs" />
     <Compile Include="BaseClasses\PluginBase.cs" />
+    <Compile Include="CrossDomainTracing.cs" />
     <Compile Include="SandboxApplicationManager.cs" />
     <Compile Include="DefaultApplicationManager.cs" />

branches/2213_irace/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginManager.cs

@@ -129 +129 @@
         applicationManager.PrepareApplicationDomain(applications, plugins);
         OnApplicationStarted(new PluginInfrastructureEventArgs(appInfo));
+        CrossDomainTracer.StartListening(applicationDomain);
         applicationManager.Run(appInfo, args);
       }

branches/2213_irace/HeuristicLab.PluginInfrastructure/3.3/Starter/SplashScreen.cs

@@ -100 +100 @@
     private void SafeUpdateMessage(string msg) {
       try {
-        Invoke((Action<string>)UpdateMessage, msg);
-      }
-      catch (ObjectDisposedException) { }
+        if (InvokeRequired) {
+          Invoke((Action<string>)UpdateMessage, msg);
+        } else {
+          UpdateMessage(msg);
+        }
+      } catch (ObjectDisposedException) { }
     }
 

branches/2213_irace/HeuristicLab.PluginInfrastructure/3.3/Starter/StarterForm.cs

@@ -88 +88 @@
       : this() {
       arguments = CommandLineArgumentHandling.GetArguments(args);
+
+      InitializeComponent();
+      largeImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.HeuristicLab.ToBitmap());
+      largeImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.UpdateAvailable.ToBitmap());
+      smallImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.HeuristicLab.ToBitmap());
+      smallImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.UpdateAvailable.ToBitmap());
+      Text = "HeuristicLab " + AssemblyHelpers.GetFileVersion(GetType().Assembly);
+
+      string pluginPath = Path.GetFullPath(Application.StartupPath);
+      pluginManager = new PluginManager(pluginPath);
+      splashScreen = new SplashScreen(pluginManager, 1000);
+      splashScreen.VisibleChanged += new EventHandler(splashScreen_VisibleChanged);
+      if (arguments.All(x => !(x is HideStarterArgument)))
+        splashScreen.Show(this, "Loading HeuristicLab...");
+
+      if (CheckSavedStarterFormSettings()) {
+        Location = Settings.Default.StarterFormLocation;
+        Size = Settings.Default.StarterFormSize;
+        WindowState = Settings.Default.StarterFormWindowState;
+      }
+
+      pluginManager.DiscoverAndCheckPlugins();
+      UpdateApplicationsList();
+
+      CheckUpdatesAvailableAsync();
     }
 
@@ -320 +345 @@
 
     private void StartApplication(ApplicationDescription app, ICommandLineArgument[] args) {
-      splashScreen.Show("Loading " + app.Name);
+      if (args.All(x => !(x is HideStarterArgument)))
+        splashScreen.Show("Loading " + app.Name);
       Thread t = new Thread(delegate() {
         bool stopped = false;