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

Timestamp:

06/16/11 12:39:32 (13 years ago)

Author:

ascheibe

Message:

#1233 removed useLocalPlugins

Location:

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

Files:

• HiveClient.cs (modified) (7 diffs)
• ServiceClients/HiveExperiment.cs (modified) (3 diffs)
• ServiceClients/HiveServiceClient.cs (modified) (2 diffs)
• ServiceClients/Plugin.cs (modified) (2 diffs)
• Util/PluginUtil.cs (modified) (3 diffs)

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

@@ -219 +219 @@
           this.OnlinePlugins = service.GetPlugins();
           this.AlreadyUploadedPlugins = new List<Plugin>();
-          Plugin configFilePlugin = UploadConfigurationFile(service);
+          Plugin configFilePlugin = UploadConfigurationFile(service, onlinePlugins);
           this.alreadyUploadedPlugins.Add(configFilePlugin);
 
@@ -226 +226 @@
 
           foreach (HiveJob hiveJob in refreshableHiveExperiment.HiveExperiment.HiveJobs) {
-            UploadJobWithChildren(refreshableHiveExperiment.HiveExperiment.Progress, service, hiveJob, null, resourceIds, ref jobCount, totalJobCount, configFilePlugin.Id, refreshableHiveExperiment.HiveExperiment.UseLocalPlugins, refreshableHiveExperiment.HiveExperiment.Id, refreshableHiveExperiment.Log, refreshableHiveExperiment.HiveExperiment.IsPrivileged);
+            UploadJobWithChildren(refreshableHiveExperiment.HiveExperiment.Progress, service, hiveJob, null, resourceIds, ref jobCount, totalJobCount, configFilePlugin.Id, refreshableHiveExperiment.HiveExperiment.Id, refreshableHiveExperiment.Log, refreshableHiveExperiment.HiveExperiment.IsPrivileged);
           }
 
@@ -240 +240 @@
     /// Uploads the local configuration file as plugin
     /// </summary>
-    private static Plugin UploadConfigurationFile(IHiveService service) {
+    private static Plugin UploadConfigurationFile(IHiveService service, List<Plugin> onlinePlugins) {
       string exeFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "HeuristicLab 3.3.exe");
       string configFileName = Path.GetFileName(ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath);
@@ -251 +251 @@
       }
 
-      Plugin configPlugin = new Plugin() { Name = "Configuration", IsLocal = true, Version = new Version(), Hash = hash };
+      Plugin configPlugin = new Plugin() { Name = "Configuration", Version = new Version(), Hash = hash };
       PluginData configFile = new PluginData() { FileName = configFileName, Data = data };
-      configPlugin.Id = service.AddPlugin(configPlugin, new List<PluginData> { configFile });
-      return configPlugin;
+
+      IEnumerable<Plugin> onlineConfig = onlinePlugins.Where(p => p.Hash.SequenceEqual(hash));
+
+      if (onlineConfig.Count() > 0) {
+        return onlineConfig.First();
+      } else {
+        configPlugin.Id = service.AddPlugin(configPlugin, new List<PluginData> { configFile });
+        return configPlugin;
+      }
     }
 
@@ -264 +271 @@
     /// <param name="parentHiveJob">shall be null if its the root job</param>
     /// <param name="groups"></param>
-    private void UploadJobWithChildren(IProgress progress, IHiveService service, HiveJob hiveJob, HiveJob parentHiveJob, IEnumerable<Guid> groups, ref int jobCount, int totalJobCount, Guid configPluginId, bool useLocalPlugins, Guid hiveExperimentId, ILog log, bool isPrivileged) {
+    private void UploadJobWithChildren(IProgress progress, IHiveService service, HiveJob hiveJob, HiveJob parentHiveJob, IEnumerable<Guid> groups, ref int jobCount, int totalJobCount, Guid configPluginId, Guid hiveExperimentId, ILog log, bool isPrivileged) {
       jobCount++;
       progress.Status = string.Format("Serializing job {0} of {1}", jobCount, totalJobCount);
@@ -281 +288 @@
 
       TryAndRepeat(() => {
-        hiveJob.Job.PluginsNeededIds = PluginUtil.GetPluginDependencies(service, this.onlinePlugins, this.alreadyUploadedPlugins, plugins, useLocalPlugins);
+        hiveJob.Job.PluginsNeededIds = PluginUtil.GetPluginDependencies(service, this.onlinePlugins, this.alreadyUploadedPlugins, plugins);
       }, -1, "Failed to upload plugins");
       hiveJob.Job.PluginsNeededIds.Add(configPluginId);
@@ -300 +307 @@
 
       foreach (HiveJob child in hiveJob.ChildHiveJobs) {
-        UploadJobWithChildren(progress, service, child, hiveJob, groups, ref jobCount, totalJobCount, configPluginId, useLocalPlugins, hiveExperimentId, log, isPrivileged);
+        UploadJobWithChildren(progress, service, child, hiveJob, groups, ref jobCount, totalJobCount, configPluginId, hiveExperimentId, log, isPrivileged);
       }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs

@@ -30 +30 @@
 namespace HeuristicLab.Clients.Hive {
   public partial class HiveExperiment : IDeepCloneable, IContent, IProgressReporter {
-    private bool useLocalPlugins;
-    public bool UseLocalPlugins {
-      get { return useLocalPlugins; }
-      set { useLocalPlugins = value; }
-    }
 
     private bool isPrivileged;
@@ -115 +110 @@
       this.Id = original.Id;
       this.HiveJobs = cloner.Clone(original.HiveJobs);
-      this.UseLocalPlugins = original.UseLocalPlugins;
       this.ExecutionTime = original.ExecutionTime;
       this.IsPrivileged = original.IsPrivileged;
@@ -213 +207 @@
       OnHiveJobsAdded(e);
     }
-    
+
     private void item_StateLogChanged(object sender, EventArgs e) {
       OnStateLogListChanged();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs

@@ -514 +514 @@
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
-    private bool IsLocalField;
-
-    [System.Runtime.Serialization.OptionalFieldAttribute()]
     private System.Guid UserIdField;
 
@@ -544 +541 @@
           this.HashField = value;
           this.RaisePropertyChanged("Hash");
-        }
-      }
-    }
-
-    [System.Runtime.Serialization.DataMemberAttribute()]
-    public bool IsLocal {
-      get {
-        return this.IsLocalField;
-      }
-      set {
-        if ((this.IsLocalField.Equals(value) != true)) {
-          this.IsLocalField = value;
-          this.RaisePropertyChanged("IsLocal");
         }
       }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/Plugin.cs

@@ -33 +33 @@
       this.UserId = original.UserId;
       this.DateCreated = original.DateCreated;
-      this.IsLocal = original.IsLocal;
     }
 
@@ -41 +40 @@
 
     public override string ToString() {
-      return string.Format("{0}-{1}", this.Name, this.Version.ToString()) + (this.IsLocal ? ", Local" : string.Empty);
+      return string.Format("{0}-{1}", this.Name, this.Version.ToString());
     }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Util/PluginUtil.cs

@@ -38 +38 @@
     /// <param name="alreadyUploadedPlugins">List of plugins which have been uploaded from this HiveExperiment</param>
     /// <param name="neededPlugins">List of plugins which need to be uploaded</param>
-    /// <param name="useLocalPlugins">If true, the plugins which are already online are ignored. All local plugins are uploaded, but only once.</param>
     /// <returns></returns>
-    public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins, bool useLocalPlugins) {
+    public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins) {
       var pluginIds = new List<Guid>();
       Dictionary<IPluginDescription, byte[]> checksumsNeededPlugins = CalcChecksumsForPlugins(neededPlugins);
@@ -55 +54 @@
           });
 
-          if (useLocalPlugins || foundPlugin == null) {
-            Plugin p = CreatePlugin(neededPlugin.Key, useLocalPlugins, neededPlugin.Value);
+          if (foundPlugin == null) {
+            Plugin p = CreatePlugin(neededPlugin.Key, neededPlugin.Value);
             List<PluginData> pd = CreatePluginDatas(neededPlugin.Key);
             try {
@@ -76 +75 @@
     }
 
-    private static Plugin CreatePlugin(IPluginDescription plugin, bool useLocalPlugins, byte[] hash) {
-      return new Plugin() { Name = plugin.Name, Version = plugin.Version, IsLocal = useLocalPlugins, Hash = hash };
+    private static Plugin CreatePlugin(IPluginDescription plugin, byte[] hash) {
+      return new Plugin() { Name = plugin.Name, Version = plugin.Version, Hash = hash };
     }
 
-    public static Plugin CreatePlugin(IPluginDescription plugin, bool useLocalPlugins) {
-      return new Plugin() { Name = plugin.Name, Version = plugin.Version, IsLocal = useLocalPlugins };
+    public static Plugin CreatePlugin(IPluginDescription plugin) {
+      return new Plugin() { Name = plugin.Name, Version = plugin.Version };
     }