Changeset 5402 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJobClient.cs

Timestamp:

01/31/11 18:15:15 (13 years ago)

Author:

cneumuel

Message:

#1233

• single sign on with HL
• local plugins are uploaded if not available online (user can force the useage of local plugins)
• changed plugin and plugindata db-schema
• plugin dao tests

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJobClient.cs (modified) (10 diffs)

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

@@ -107 +107 @@
     public HiveJob() {
       this.Job = new Job() {
-        JobState = JobState.Waiting,
+        JobState = JobState.Offline,
         DateCreated = DateTime.Now,
         CoresNeeded = 1,
@@ -191 +191 @@
         if (OptimizerJob.Optimizer is Optimization.Experiment) {
           Optimization.Experiment experiment = OptimizerJob.OptimizerAsExperiment;
-          experiment.Optimizers.ItemsAdded += new Collections.CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsAdded);
-          experiment.Optimizers.ItemsReplaced += new Collections.CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsReplaced);
-          experiment.Optimizers.ItemsRemoved += new Collections.CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsRemoved);
+          experiment.Optimizers.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsAdded);
+          experiment.Optimizers.ItemsReplaced += new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsReplaced);
+          experiment.Optimizers.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsRemoved);
           experiment.Optimizers.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_CollectionReset);
         } else if (OptimizerJob.Optimizer is Optimization.BatchRun) {
@@ -208 +208 @@
         if (OptimizerJob.Optimizer is Optimization.Experiment) {
           Optimization.Experiment experiment = OptimizerJob.OptimizerAsExperiment;
-          experiment.Optimizers.ItemsAdded -= new Collections.CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsAdded);
-          experiment.Optimizers.ItemsReplaced -= new Collections.CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsReplaced);
-          experiment.Optimizers.ItemsRemoved -= new Collections.CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsRemoved);
+          experiment.Optimizers.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsAdded);
+          experiment.Optimizers.ItemsReplaced -= new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsReplaced);
+          experiment.Optimizers.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsRemoved);
           experiment.Optimizers.CollectionReset -= new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_CollectionReset);
         } else if (OptimizerJob.Optimizer is Optimization.BatchRun) {
@@ -222 +222 @@
     }
 
-    void batchRun_OptimizerChanged(object sender, EventArgs e) {
+    private void batchRun_OptimizerChanged(object sender, EventArgs e) {
       if (syncJobsWithOptimizers) {
         this.childHiveJobs.Clear();
@@ -229 +229 @@
     }
 
-    void batchRun_RepetitionsChanged(object sender, EventArgs e) {
+    private void batchRun_RepetitionsChanged(object sender, EventArgs e) {
       if (syncJobsWithOptimizers) {
         UpdateChildHiveJobs();
@@ -235 +235 @@
     }
 
-    void OptimizerJob_ToStringChanged(object sender, EventArgs e) {
+    private void OptimizerJob_ToStringChanged(object sender, EventArgs e) {
       this.OnToStringChanged();
     }
@@ -267 +267 @@
       }
     }
-    void Optimizers_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
+    private void Optimizers_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
       if (syncJobsWithOptimizers && this.OptimizerJob.ComputeInParallel) {
         foreach (var item in e.Items) {
@@ -275 +275 @@
     }
 
-    void OptimizerJob_ComputeInParallelChanged(object sender, EventArgs e) {
+    private void OptimizerJob_ComputeInParallelChanged(object sender, EventArgs e) {
       if (OptimizerJob != null && syncJobsWithOptimizers) {
         if (OptimizerJob.ComputeInParallel) {
@@ -445 +445 @@
       }
 
-      UpdateRequiredPlugins();
-
       JobData jobData = new JobData() {
         JobId = job.Id,
@@ -453 +451 @@
 
       return jobData;
-    }
-
-    /// <summary>
-    /// find out which which plugins are needed for the given object
-    /// </summary>
-    private void UpdateRequiredPlugins() {
-      List<Guid> pluginList = new List<Guid>();
-
-      IEnumerable<IPluginDescription> neededPlugins = ApplicationManager.Manager.Plugins; //HivePluginInfoDto.FindPluginsNeeded(optimizerJob.GetType());
-      using (var service = ServiceLocator.Instance.GetService()) {
-        IEnumerable<Plugin> availablePlugins = service.Obj.GetPlugins();
-        foreach (IPluginDescription neededPlugin in neededPlugins) {
-          Plugin found = availablePlugins.Where(availablePlugin => availablePlugin.Name == neededPlugin.Name && availablePlugin.Version.Major == neededPlugin.Version.Major && availablePlugin.Version.Minor == neededPlugin.Version.Minor && availablePlugin.Version.Revision == neededPlugin.Version.Revision && availablePlugin.Version.MinorRevision == neededPlugin.Version.MinorRevision).SingleOrDefault();
-          if (found != null) {
-            pluginList.Add(found.Id);
-          } else {
-            Plugin p = new Plugin() { Name = neededPlugin.Name, Version = neededPlugin.Version };
-            List<PluginData> pluginDatas = new List<PluginData>();
-
-            foreach (IPluginFile pf in neededPlugin.Files) {
-              PluginData pluginData = new PluginData();
-
-              pluginData.Data = File.ReadAllBytes(pf.Name);
-              pluginDatas.Add(pluginData);
-            }
-            pluginList.Add(service.Obj.AddPlugin(p, pluginDatas));
-          }
-        }
-      }
-      this.Job.PluginsNeededIds = pluginList;
     }