Changeset 15913 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views

Timestamp:

04/20/18 11:52:33 (6 years ago)

Author:

jzenisek

Message:

#2839: updated genealogy computation for hive job administrator

Location:

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views

Files:

• HiveResourceSelector.cs (modified) (18 diffs)
• HiveResourceSelectorDialog.cs (modified) (1 diff)
• RefreshableHiveJobView.cs (modified) (1 diff)

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs

@@ -43 +43 @@
     public const string additionalSlavesGroupDescription = "Contains additional slaves which are either ungrouped or the parenting slave group is not assigned to the selected project.";
 
+    private const string CURRENT_SELECTION_TAG = " [current selection]";
+    private const string NEW_SELECTION_TAG = " [new selection]";
+    private const string CHANGED_SELECTION_TAG = " [changed selection]";
 
     private readonly HashSet<TreeNode> mainTreeNodes = new HashSet<TreeNode>();
@@ -54 +57 @@
     private readonly HashSet<Resource> newIncludedResources = new HashSet<Resource>();
 
-    private readonly Dictionary<Guid, HashSet<Project>> projectAncestors = new Dictionary<Guid, HashSet<Project>>();
-    private readonly Dictionary<Guid, HashSet<Project>> projectDescendants = new Dictionary<Guid, HashSet<Project>>();
-    private readonly Dictionary<Guid, HashSet<Resource>> resourceAncestors = new Dictionary<Guid, HashSet<Resource>>();
-    private readonly Dictionary<Guid, HashSet<Resource>> resourceDescendants = new Dictionary<Guid, HashSet<Resource>>();
-
     private IEnumerable<Resource> addedResources;
     private IEnumerable<Resource> removedResources;
@@ -68 +66 @@
     private readonly Color addedIncludeColor = Color.FromArgb(25, 169, 221, 221); // #a9dddd
     private readonly Color removedIncludeColor = Color.FromArgb(25, 249, 210, 145); // #f9d291
-    private readonly Color selectedColor = Color.FromArgb(255, 240, 194, 59); // #f0c23b
+    private readonly Color selectedBackColor = Color.DodgerBlue;
+    private readonly Color selectedForeColor = Color.White;
 
     private string currentSearchString;
@@ -173 +172 @@
       base.OnContentChanged();
 
-      if (Content != null) {       
-        UpdateProjectGenealogy();
-        UpdateResourceGenealogy();
-        
+      if (Content != null) {               
         if (SelectedProjectId.HasValue && SelectedProjectId.Value != Guid.Empty) {
           SelectedProject = GetSelectedProjectById(SelectedProjectId.Value);
@@ -218 +214 @@
         projectsTreeView.SelectedNode = null;
       } else {
-        ReColorTreeNodes(projectsTreeView.Nodes, selectedColor, Color.Transparent, true);
-        e.Node.BackColor = selectedColor;
+        ResetTreeNodes(projectsTreeView.Nodes);
+        e.Node.BackColor = selectedBackColor;
+        e.Node.ForeColor = selectedForeColor;
         
         if(node.Id == projectId) {
-          e.Node.Text += " [current selection]";
+          e.Node.Text += CURRENT_SELECTION_TAG;
         } else if(projectId == null || projectId == Guid.Empty) {
-          e.Node.Text += " [new selection]";
+          e.Node.Text += NEW_SELECTION_TAG;
         } else {
-          e.Node.Text += " [changed selection]";
+          e.Node.Text += CHANGED_SELECTION_TAG;
         }
 
@@ -270 +267 @@
 
     #region Helpers
-
-
-    #region old
-    private void UpdateMainTree() {
-      mainTreeNodes.Clear();
-
-      foreach (Project g in Content.OrderBy(x => x.Name)) {
-        if (g.ParentProjectId == null) {
-          TreeNode tn = new TreeNode();
-          tn.ImageIndex = greenFlagImageIndex;
-          tn.SelectedImageIndex = tn.ImageIndex;
-
-          tn.Tag = g;
-          tn.Text = g.Name;
-          tn.Checked = assignedResources.Any(x => x.Id == g.Id);
-
-          BuildMainTree(tn);
-          mainTreeNodes.Add(tn);
-        }
-      }
-      UpdateFilteredTree();
-    }
-
-    private void BuildMainTree(TreeNode tn) {
-      foreach (Project r in Content.Where(s => s.ParentProjectId != null && s.ParentProjectId == ((Project)tn.Tag).Id).OrderBy(x => x.Name)) {
-        TreeNode stn = new TreeNode(r.Name);
-        stn.ImageIndex = redFlagImageIndex;
-        stn.SelectedImageIndex = stn.ImageIndex;
-        stn.Tag = r;
-        stn.Checked = assignedResources.Any(x => x.Id == r.Id);
-        tn.Nodes.Add(stn);
-        mainTreeNodes.Add(stn);
-
-        BuildMainTree(stn);
-      }
-    }
-
-    private void UpdateFilteredTree() {
-      filteredTreeNodes.Clear();
-      foreach (TreeNode n in mainTreeNodes) {
-        n.BackColor = SystemColors.Window;
-        if (currentSearchString == null || ((Project)n.Tag).Name.ToLower().Contains(currentSearchString)) {
-          n.BackColor = string.IsNullOrEmpty(currentSearchString) ? SystemColors.Window : Color.LightBlue;
-          filteredTreeNodes.Add(n);
-          TraverseParentNodes(n);
-        }
-      }
-      UpdateProjectsTree();
-    }
-
-    private void UpdateProjectsTree() {
-      projectsTreeView.Nodes.Clear();
-      nodeStore.Clear();
-
-      foreach (TreeNode node in filteredTreeNodes) {
-        var clone = nodeStore.SingleOrDefault(x => ((Project)x.Tag).Id == ((Project)node.Tag).Id);
-        if (clone == null) {
-          clone = (TreeNode)node.Clone();
-          nodeStore.Add(clone);
-          clone.Nodes.Clear();
-        }
-        foreach (TreeNode child in node.Nodes)
-          if (filteredTreeNodes.Any(x => ((Project)x.Tag).Id == ((Project)child.Tag).Id)) {
-            var childClone = nodeStore.SingleOrDefault(x => ((Project)x.Tag).Id == ((Project)child.Tag).Id);
-            if (childClone == null) {
-              childClone = (TreeNode)child.Clone();
-              nodeStore.Add(childClone);
-              childClone.Nodes.Clear();
-            }
-            clone.Nodes.Add(childClone);
-          }
-      }
-      projectsTreeView.Nodes.AddRange(nodeStore.Where(x => ((Project)x.Tag).ParentProjectId == null).ToArray());
-      if (string.IsNullOrEmpty(currentSearchString)) ExpandSlaveGroupNodes();
-      else projectsTreeView.ExpandAll();
-    }
-
-    private void TraverseParentNodes(TreeNode node) {
-      if (node != null) {
-        for (TreeNode parent = node.Parent; parent != null; parent = parent.Parent)
-          filteredTreeNodes.Add(parent);
-      }
-    }
-    #endregion
 
     private Project GetSelectedProjectById(Guid projectId) {
@@ -368 +281 @@
           if(project.Name.ToLower().Contains(currentSearchString.ToLower())) {
             filteredProjects.Add(project);
-            filteredProjects.UnionWith(projectAncestors[project.Id]);
+            filteredProjects.UnionWith(Content.Where(p => HiveClient.Instance.ProjectAncestors[project.Id].Contains(p.Id)));
           }
         }
@@ -379 +292 @@
       if (!projects.Any()) return;
 
-      // select all top level projects (withouth parent, or without parent within current project collection)
+      // select all top level projects (withouth parent, or without any ancestor within current project collection)
       var mainProjects = new HashSet<Project>(projects.Where(x => x.ParentProjectId == null));
       var parentedMainProjects = new HashSet<Project>(projects
         .Where(x => x.ParentProjectId.HasValue
-        && !projects.Select(y => y.Id).Contains(x.ParentProjectId.Value)));
+        && !projects.Select(y => y.Id).Contains(x.ParentProjectId.Value)
+        && !projects.SelectMany(y => HiveClient.Instance.ProjectAncestors[y.Id]).Contains(x.ParentProjectId.Value)));
       mainProjects.UnionWith(parentedMainProjects);
       var subProbjects = new HashSet<Project>(projects.Except(mainProjects));
+      foreach(var p in subProbjects) {
+        p.ParentProjectId = HiveClient.Instance.ProjectAncestors[p.Id].Where(x => projects.Select(y => y.Id).Contains(x)).FirstOrDefault();
+      }
 
       var stack = new Stack<Project>(mainProjects.OrderByDescending(x => x.Name));
@@ -412 +329 @@
 
         if (SelectedProject != null && SelectedProject.Id.Equals(newProject.Id)) {
-          newNode.BackColor = selectedColor;
+          newNode.BackColor = selectedBackColor;
+          newNode.ForeColor = selectedForeColor;
           if(SelectedProject.Id == projectId) {
-            newNode.Text += " [current selection]";
+            newNode.Text += CURRENT_SELECTION_TAG;
           } else if (projectId == null || projectId == Guid.Empty) {
-            newNode.Text += " [new selection]";
+            newNode.Text += NEW_SELECTION_TAG;
           } else {
-            newNode.Text += " [changed selection]";
+            newNode.Text += CHANGED_SELECTION_TAG;
           }
         }
@@ -439 +357 @@
       projectsTreeView.ExpandAll();
     }
-
-    private void UpdateProjectGenealogy() {
-      projectAncestors.Clear();
-      projectDescendants.Clear();
-      var projects = Content;
-
-      foreach (var p in projects) {
-        projectAncestors.Add(p.Id, new HashSet<Project>());
-        projectDescendants.Add(p.Id, new HashSet<Project>());
-      }
-
-      foreach (var p in projects) {
-        var parentProjectId = p.ParentProjectId;
-        while (parentProjectId != null) {
-          var parent = projects.SingleOrDefault(x => x.Id == parentProjectId);
-          if (parent != null) {
-            projectAncestors[p.Id].Add(parent);
-            projectDescendants[parent.Id].Add(p);
-            parentProjectId = parent.ParentProjectId;
-          } else {
-            parentProjectId = null;
-          }
-        }
-      }
-    }
-
 
     private static IEnumerable<Resource> GetAssignedResourcesForProject(Guid projectId) {
@@ -495 +387 @@
         foreach (var resource in assignedProjectResources) {
           availableResources.Add(resource);
-          foreach(var descendant in resourceDescendants[resource.Id]) {
+          foreach(var descendant in HiveClient.Instance.Resources.Where(x => HiveClient.Instance.ResourceDescendants[resource.Id].Contains(x.Id))) {
             availableResources.Add(descendant);
           }
@@ -544 +436 @@
     private void UpdateNewAssignedResources() {
       for(int i = newAssignedResources.Count-1; i>=0; i--) {
-        if(newAssignedResources.Intersect(resourceAncestors[newAssignedResources.ElementAt(i).Id]).Any()) {
+        if(newAssignedResources.Intersect(HiveClient.Instance.GetAvailableParentResources(newAssignedResources.ElementAt(i).Id)).Any()) {
           newAssignedResources.Remove(newAssignedResources.ElementAt(i));
         }
@@ -556 +448 @@
       if (JobId != Guid.Empty) {
         foreach (var item in assignedResources) {
-          foreach (var descendant in resourceDescendants[item.Id]) {
+          foreach (var descendant in HiveClient.Instance.GetAvailableChildResources(item.Id)) {
             includedResources.Add(descendant);
           }
@@ -563 +455 @@
 
       foreach (var item in newAssignedResources) {
-        foreach (var descendant in resourceDescendants[item.Id]) {
+        foreach (var descendant in HiveClient.Instance.GetAvailableChildResources(item.Id)) {
           newIncludedResources.Add(descendant);
         }
@@ -572 +464 @@
       newIncludedResources.Clear();
       foreach (var item in newAssignedResources) {
-        foreach (var descendant in resourceDescendants[item.Id]) {
+        foreach (var descendant in HiveClient.Instance.GetAvailableChildResources(item.Id)) {
           newIncludedResources.Add(descendant);
-        }
-      }
-    }
-
-    private void UpdateResourceGenealogy() {
-      resourceAncestors.Clear();
-      resourceDescendants.Clear();
-      var resources = HiveClient.Instance.Resources;
-
-      foreach (var r in resources) {
-        resourceAncestors.Add(r.Id, new HashSet<Resource>());
-        resourceDescendants.Add(r.Id, new HashSet<Resource>());
-      }
-
-      foreach (var r in resources) {
-        var parentResourceId = r.ParentResourceId;
-        while (parentResourceId != null) {
-          var parent = resources.SingleOrDefault(x => x.Id == parentResourceId);
-          if (parent != null) {
-            resourceAncestors[r.Id].Add(parent);
-            resourceDescendants[parent.Id].Add(r);
-            parentResourceId = parent.ParentResourceId;
-          } else {
-            parentResourceId = null;
-          }
         }
       }
@@ -743 +610 @@
       HashSet<Slave> newAssignedSlaves = new HashSet<Slave>(newAssignedResources.OfType<Slave>());
       foreach (var slaveGroup in newAssignedResources.OfType<SlaveGroup>()) {
-        foreach(var slave in resourceDescendants[slaveGroup.Id].OfType<Slave>()) {
+        foreach(var slave in HiveClient.Instance.ResourceDescendants[slaveGroup.Id].OfType<Slave>()) {
           newAssignedSlaves.Add(slave);
         }
@@ -753 +620 @@
         var slaveGroup = resource as SlaveGroup;
         if (slaveGroup != null) {
-          selectedSlaves = new HashSet<Slave>(resourceDescendants[slaveGroup.Id].OfType<Slave>());
+          selectedSlaves = new HashSet<Slave>(HiveClient.Instance.ResourceDescendants[slaveGroup.Id].OfType<Slave>());
           //selectedSlaves.IntersectWith(newAssignedSlaves);
         } else {
@@ -771 +638 @@
     }
 
-    private void ReColorTreeNodes(TreeNodeCollection nodes, Color c1, Color c2, bool resetText) {
+    private void StyleTreeNode(TreeNode n, string name) {
+      n.Text = name;
+      n.BackColor = Color.Transparent;
+      n.ForeColor = Color.Black;
+    }
+
+    private void ResetTreeNodes(TreeNodeCollection nodes) {
       foreach (TreeNode n in nodes) {
-        if (n.BackColor.Equals(c1)) {
-          n.BackColor = c2;
-          if(resetText) n.Text = ((Project)n.Tag).Name;
-        }
+        string name = "";
+        if (n.Tag is Project) name = ((Project)n.Tag).Name;
+        else if (n.Tag is Resource) name = ((Resource)n.Tag).Name;
+        StyleTreeNode(n, name);
         if (n.Nodes.Count > 0) {
-          ReColorTreeNodes(n.Nodes, c1, c2, resetText);
+          ResetTreeNodes(n.Nodes);
         }
       }

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs

@@ -161 +161 @@
       hiveResourceSelector.SelectedProjectId = selectedProjectId;
       hiveResourceSelector.SelectedResourceIds = selectedResourceIds;
-      var projectList = new ItemList<Project>(HiveServiceLocator.Instance.CallHiveService(s => s.GetProjects()));
-      hiveResourceSelector.Content = projectList;
+      hiveResourceSelector.Content = HiveClient.Instance.Projects;
     }
 

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -482 +482 @@
     }
 
-    //private void updateButton_Click(object sender, EventArgs e) {
-    //  var task = System.Threading.Tasks.Task.Factory.StartNew(UpdateJobAsync, Content);
-    //  task.ContinueWith((t) => {
-    //    Content.Progress.Finish();
-    //    MessageBox.Show("An error occured updating the job. See the log for more information.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Error);
-    //    Content.Log.LogException(t.Exception);
-    //  }, TaskContinuationOptions.OnlyOnFaulted);
-    //}
-
-    //private void UpdateJobAsync(object job) {
-    //  Content.Progress.Start("Updating job...");
-    //  HiveClient.UpdateJob((RefreshableJob)job);
-    //  Content.Progress.Finish();
-    //}
-
     private void UnloadButton_Click(object sender, EventArgs e) {
       Content.Unload();