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

Timestamp:

01/31/11 18:15:15 (14 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

Location:

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

Files:

• ExperimentManager/HiveExperimentClient.cs (modified) (9 diffs)
• ExperimentManager/HiveExperimentManagerClient.cs (modified) (1 diff)
• ExperimentManager/HiveJobClient.cs (modified) (10 diffs)
• HeuristicLab.Clients.Hive-3.4.csproj (modified) (1 diff)
• app.config (modified) (1 diff)

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

@@ -29 +29 @@
 using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
+using HeuristicLab.Services.Hive.Common.DataTransfer;
+using HeuristicLab.Clients.Hive.Jobs;
+using HeuristicLab.Clients.Common;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Clients.Hive {
   using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
-  using HeuristicLab.Services.Hive.Common.DataTransfer;
-  using HeuristicLab.Clients.Hive.Jobs;
-  using HeuristicLab.Clients.Common;
+  using HeuristicLab.PluginInfrastructure;
+  using System.IO;
 
   /// <summary>
@@ -111 +114 @@
     }
 
+    private List<Guid> pluginsNeededIds;
+    public List<Guid> PluginsNeededIds {
+      get { return pluginsNeededIds; }
+      set { pluginsNeededIds = value; } 
+    }
+
+    private bool useLocalPlugins;
+    public bool UseLocalPlugins {
+      get { return useLocalPlugins; }
+      set { useLocalPlugins = value; }
+    }
+    
     public HiveExperimentClient() : base(itemName, itemDescription) {
       // TODO //this.ResourceIds = HeuristicLab.Hive.Experiment.Properties.Settings.Default.ResourceIds;
-      this.ResourceIds = "MyGroup";
+      this.ResourceIds = "HEAL";
       this.log = new Log();
       InitTimer();
@@ -151 +166 @@
     }
 
-    public void SetExperiment(Optimization.Experiment experiment) {
+    public void SetExperiment(Experiment experiment) {
       this.HiveJob = new HiveJob(experiment);
       Prepare();
@@ -171 +186 @@
     /// Returns the experiment from the root HiveJob
     /// </summary>
-    public Optimization.Experiment GetExperiment() {
+    public Experiment GetExperiment() {
       if (this.HiveJob != null) {
         return HiveJob.OptimizerJob.OptimizerAsExperiment;
@@ -179 +194 @@
 
     #region IExecutable Members
-    private Core.ExecutionState executionState;
+    private ExecutionState executionState;
     public ExecutionState ExecutionState {
       get { return executionState; }
@@ -231 +246 @@
           int jobCount = 0;
 
+          this.progress.Status = "Uploading plugins...";
+          this.PluginsNeededIds = GetPluginsNeededIds(this.useLocalPlugins);
+
           this.progress.Status = "Uploading jobs...";
           UploadJobWithChildren(service.Obj, this.HiveJob, null, groups, ref jobCount, totalJobCount);
@@ -251 +269 @@
         IsProgressing = false;
       }
+    }
+
+    /// <summary>
+    /// Gets the Ids of all plugins needed for executing the job.
+    /// All loaded plugins are assumed to be necessary.
+    /// If a plugin with the same name and version is already online, it is used. Otherwise the local plugin is uploaded.
+    /// If useLocalPlugins is true, all local plugins are uploaded regardless of the existence of the same plugin online.
+    /// </summary>
+    public static List<Guid> GetPluginsNeededIds(bool useLocalPlugins) {
+      IEnumerable<IPluginDescription> localPlugins = ApplicationManager.Manager.Plugins;
+      List<Guid> pluginsNeededIds = new List<Guid>();
+
+      using (var service = ServiceLocator.Instance.GetService()) {
+        IEnumerable<Plugin> onlinePlugins = service.Obj.GetPlugins();
+
+        foreach (IPluginDescription localPlugin in localPlugins) {
+          Plugin found = onlinePlugins.Where(onlinePlugin => onlinePlugin.Name == localPlugin.Name && onlinePlugin.Version == localPlugin.Version).SingleOrDefault();
+          if (!useLocalPlugins && found != null) {
+            // plugin is available online; reuse
+            pluginsNeededIds.Add(found.Id);
+          } else {
+            // upload the plugin
+            Plugin p = new Plugin() { Name = localPlugin.Name, Version = localPlugin.Version, IsLocal = useLocalPlugins };
+            List<PluginData> pluginDatas = new List<PluginData>();
+
+            foreach (IPluginFile pf in localPlugin.Files) {
+              PluginData pluginData = new PluginData();
+
+              pluginData.Data = File.ReadAllBytes(pf.Name);
+              pluginDatas.Add(pluginData);
+            }
+            pluginsNeededIds.Add(service.Obj.AddPlugin(p, pluginDatas));
+          }
+        }
+      }
+      return pluginsNeededIds;
     }
 
@@ -273 +327 @@
         jobData = hiveJob.GetAsJobData(false);
       }
+
+      hiveJob.Job.PluginsNeededIds = this.PluginsNeededIds;
 
       this.progress.Status = string.Format("Uploading job {0} of {1} ({2} kb)", jobCount, totalJobCount, jobData.Data.Count() / 1024);
@@ -618 +674 @@
       }
     }
+    
   }
 }

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

@@ -137 +137 @@
     }
 
-    void hiveExperiments_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<Collections.IndexedItem<HiveExperimentClient>> e) {
+    void hiveExperiments_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<HiveExperimentClient>> e) {
       if (!currentlyUpdating) {
         using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {

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;
     }
 

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

@@ -37 +37 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Debug\HeuristicLab.Clients.Hive-3.4.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\HeuristicLab.Clients.Hive-3.4.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
   <ItemGroup>

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

@@ -15 +15 @@
             </bindings>
         <client>
-            <endpoint address="http://localhost:9000/Hive-3.4" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Services.Hive.Common.ServiceContracts.IHiveService" name="wsHttpBinding_IHiveService">
+            <endpoint address="http://localhost/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Services.Hive.Common.ServiceContracts.IHiveService" name="wsHttpBinding_IHiveService">
               <identity>
                 <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>