Changeset 5458 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive

Timestamp:

02/14/11 18:23:37 (13 years ago)

Author:

cneumuel

Message:

#1233

• removed GetConfigurationFile from service -> configuration is now submitted as a plugin with one file (the configuration file)
• resource ids are now checked before uploading a hive experiment, only valid resource names are accepted
• added SharpZipLib License to ConsoleClient project, so dependecies are satisfied

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4

Files:

• Exceptions/ResourceNotFoundException.cs (added)
• ExperimentManager/HiveExperimentClient.cs (modified) (16 diffs)
• HeuristicLab.Clients.Hive-3.4.csproj (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveExperimentClient.cs

@@ -38 +38 @@
   using HeuristicLab.PluginInfrastructure;
   using System.IO;
+  using System.Configuration;
+  using System.Reflection;
+  using HeuristicLab.PluginInfrastructure.Manager;
 
   /// <summary>
@@ -76 +79 @@
     }
 
-    private string resourceIds;
-    public string ResourceIds {
-      get { return resourceIds; }
+    private string resourceNames;
+    public string ResourceNames {
+      get { return resourceNames; }
       set {
-        if (resourceIds != value) {
-          resourceIds = value;
-          OnResourceIdsChanged();
+        if (resourceNames != value) {
+          resourceNames = value;
+          OnResourceNamesChanged();
         }
       }
@@ -117 +120 @@
     public IEnumerable<Plugin> OnlinePlugins {
       get { return onlinePlugins; }
-      set { onlinePlugins = value; } 
+      set { onlinePlugins = value; }
     }
 
@@ -131 +134 @@
       set { useLocalPlugins = value; }
     }
-    
-    public HiveExperimentClient() : base(itemName, itemDescription) {
-      // TODO //this.ResourceIds = HeuristicLab.Hive.Experiment.Properties.Settings.Default.ResourceIds;
-      this.ResourceIds = "HEAL";
+
+    public HiveExperimentClient()
+      : base(itemName, itemDescription) {
+      this.ResourceNames = "HEAL";
       this.log = new Log();
       InitTimer();
     }
-    public HiveExperimentClient(DT.HiveExperiment hiveExperimentDto) : this() {
+    public HiveExperimentClient(DT.HiveExperiment hiveExperimentDto)
+      : this() {
       UpdateFromDto(hiveExperimentDto);
     }
     protected HiveExperimentClient(HiveExperimentClient original, Cloner cloner)
       : base(original, cloner) {
-      this.ResourceIds = original.resourceIds;
+      this.ResourceNames = original.resourceNames;
       this.ExecutionState = original.executionState;
       this.ExecutionTime = original.executionTime;
@@ -158 +162 @@
       this.Name = hiveExperimentDto.Name;
       this.Description = hiveExperimentDto.Description;
-      // TODO: this.ResourceIds = hiveExperimentDto.ResourceIds;
+      this.ResourceNames = hiveExperimentDto.ResourceNames;
       this.rootJobId = hiveExperimentDto.RootJobId;
     }
@@ -167 +171 @@
         Name = this.Name,
         Description = this.Description,
-        //ResourceIds = this.ResourceIds,
+        ResourceNames = this.ResourceNames,
         RootJobId = this.rootJobId
       };
@@ -227 +231 @@
 
     public void Prepare() {
-      // do nothing
+      this.timer.Stop();
+      this.ExecutionState = Core.ExecutionState.Prepared;
+      this.ExecutionTime = TimeSpan.Zero;
     }
 
     public void Start() {
       OnStarted();
-      ExecutionTime = new TimeSpan();
+      ExecutionTime = TimeSpan.Zero;
       lastUpdateTime = DateTime.Now;
       this.ExecutionState = Core.ExecutionState.Started;
@@ -246 +252 @@
         IsProgressing = true;
         using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
-          IEnumerable<string> groups = ToResourceIdList(this.ResourceIds);
+          IEnumerable<string> resourceNames = ToResourceNameList(this.ResourceNames);
+          var resourceIds = new List<Guid>();
+          foreach (var resourceName in resourceNames) {
+            Guid resourceId = service.Obj.GetResourceId(resourceName);
+            if (resourceId == Guid.Empty) {
+              throw new ResourceNotFoundException(string.Format("Could not find the resource '{0}'", resourceName));
+            }
+            resourceIds.Add(resourceId);
+          }
+
           this.HiveJob.SetIndexInParentOptimizerList(null);
 
@@ -255 +270 @@
           this.OnlinePlugins = service.Obj.GetPlugins();
           this.AlreadyUploadedPlugins = new List<Plugin>();
+          Plugin configFilePlugin = UploadConfigurationFile(service.Obj);
+          this.alreadyUploadedPlugins.Add(configFilePlugin);
 
           this.progress.Status = "Uploading jobs...";
-          UploadJobWithChildren(service.Obj, this.HiveJob, null, groups, ref jobCount, totalJobCount);
+          UploadJobWithChildren(service.Obj, this.HiveJob, null, resourceIds, ref jobCount, totalJobCount, configFilePlugin.Id);
           this.rootJobId = this.HiveJob.Job.Id;
           LogMessage("Finished sending jobs to hive");
@@ -272 +289 @@
       catch (Exception e) {
         OnExceptionOccured(e);
+        this.Prepare();
       }
       finally {
         IsProgressing = false;
       }
+    }
+
+    /// <summary>
+    /// Uploads the local configuration file as plugin
+    /// </summary>
+    private static Plugin UploadConfigurationFile(IHiveService service) {
+      string exeFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "HeuristicLab 3.3.exe");
+      string configFileName = ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath;
+
+      Plugin configPlugin = new Plugin() {
+        Name = "Configuration",
+        IsLocal = true,
+        Version = new Version()
+      };
+      PluginData configFile = new PluginData() {
+        FileName = configFileName,
+        Data = File.ReadAllBytes(configFileName)
+      };
+      configPlugin.Id = service.AddPlugin(configPlugin, new List<PluginData> { configFile });
+      return configPlugin;
     }
 
@@ -286 +324 @@
     /// <param name="parentHiveJob">shall be null if its the root job</param>
     /// <param name="groups"></param>
-    private void UploadJobWithChildren(IHiveService service, HiveJob hiveJob, HiveJob parentHiveJob, IEnumerable<string> groups, ref int jobCount, int totalJobCount) {
+    private void UploadJobWithChildren(IHiveService service, HiveJob hiveJob, HiveJob parentHiveJob, IEnumerable<Guid> groups, ref int jobCount, int totalJobCount, Guid configPluginId) {
       jobCount++;
       this.progress.Status = string.Format("Serializing job {0} of {1}", jobCount, totalJobCount);
@@ -301 +339 @@
 
       hiveJob.Job.PluginsNeededIds = GetPluginDependencies(service, onlinePlugins, alreadyUploadedPlugins, plugins, useLocalPlugins);
+      hiveJob.Job.PluginsNeededIds.Add(configPluginId);
 
       this.progress.Status = string.Format("Uploading job {0} of {1} ({2} kb)", jobCount, totalJobCount, jobData.Data.Count() / 1024);
@@ -306 +345 @@
 
       if (parentHiveJob != null) {
-        //response = service.AddChildJob(parentHiveJob.Job.Id, serializedJob);
         hiveJob.Job.Id = service.AddChildJob(parentHiveJob.Job.Id, hiveJob.Job, jobData);
       } else {
-        // response = service.AddJobWithGroupStrings(serializedJob, groups);
-        hiveJob.Job.Id = service.AddJob(hiveJob.Job, jobData, null); // todo: use ResourceIds
+        hiveJob.Job.Id = service.AddJob(hiveJob.Job, jobData, groups);
       }
 
@@ -316 +353 @@
 
       foreach (HiveJob child in hiveJob.ChildHiveJobs) {
-        UploadJobWithChildren(service, child, hiveJob, groups, ref jobCount, totalJobCount);
-      }
-    }
-    
+        UploadJobWithChildren(service, child, hiveJob, groups, ref jobCount, totalJobCount, configPluginId);
+      }
+    }
+
     /// <summary>
     /// Converts a string which can contain Ids separated by ';' to a enumerable
     /// </summary>
-    private IEnumerable<string> ToResourceIdList(string resourceGroups) {
+    private IEnumerable<string> ToResourceNameList(string resourceGroups) {
       if (!string.IsNullOrEmpty(resourceGroups)) {
-        return resourceIds.Split(';');
+        return resourceNames.Split(';');
       } else {
         return new List<string>();
@@ -395 +432 @@
     }
 
-    public event EventHandler ResourceIdsChanged;
-    protected virtual void OnResourceIdsChanged() {
-      EventHandler handler = ResourceIdsChanged;
+    public event EventHandler ResourceNamesChanged;
+    protected virtual void OnResourceNamesChanged() {
+      EventHandler handler = ResourceNamesChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }
@@ -649 +686 @@
       }
     }
-    #endregion 
+    #endregion
 
     #region Plugin Management

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

@@ -102 +102 @@
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -118 +119 @@
     <Compile Include="Exceptions\OptimizerNotFoundException.cs" />
     <Compile Include="ExperimentManager\PluginClient.cs" />
+    <Compile Include="Exceptions\ResourceNotFoundException.cs" />
     <Compile Include="IServiceLocator.cs" />
     <Compile Include="Jobs\OptimizerJob.cs" />