Fix #151 : Hierarchical cluster sort

mpschr · mpschr · commit 22915f42087f · 2015-11-11T14:52:33.000+01:00
diff --git a/org.gitools.analysis/src/main/java/org/gitools/analysis/clustering/hierarchical/HierarchicalClusterer.java b/org.gitools.analysis/src/main/java/org/gitools/analysis/clustering/hierarchical/HierarchicalClusterer.java
@@ -134,6 +134,7 @@ public int compare(String o1, String o2) {
         // Set cluster names ordered by weight
         HierarchicalCluster root = builder.getRootCluster();
         root.setName("");
+        root.setSortName("");
         Color color = nameClusters(root.getChildren(), 1);
         root.setColor(color.getRGB());
         root.setName("root");
@@ -168,20 +169,20 @@ private Color nameClusters(List<HierarchicalCluster> children, int level) {
             } else {
                 child.setName(child.getParentName() + createLabel(i, digits));
             }
+            child.setSortName(child.getParentName() + createLabel(i, digits));
             Color colorChild = nameClusters(child.getChildren(), level+1);
             child.setColor(colorChild.getRGB());
 
             if (colorParent == null) {
                 colorParent = colorChild;
-                weightParent = (child.getChildren().isEmpty() ? 0.0 : child.getWeight());
             } else {
                 colorParent = mixColors(colorParent, weightParent, colorChild, child.getWeight());
-                weightParent += (child.getChildren().isEmpty() ? 0.0 : child.getWeight());
             }
+            weightParent = child.getWeight();
 
         }
 
-        if (level > 10) {
+        if (level > 20) {
             return next();
         }
 
diff --git a/org.gitools.heatmap/src/main/java/org/gitools/heatmap/header/HierarchicalCluster.java b/org.gitools.heatmap/src/main/java/org/gitools/heatmap/header/HierarchicalCluster.java
@@ -45,11 +45,13 @@
 import java.util.*;
 
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(propOrder = {"name", "parentName", "leaves", "distance", "weight", "color", "children"})
+@XmlType(propOrder = {"name", "sortName", "parentName", "leaves", "distance", "weight", "color", "children"})
 public class HierarchicalCluster implements Clusters, Comparable<HierarchicalCluster> {
 
     private String name;
 
+    private String sortName;
+
     private String parentName;
 
     private int leaves;
@@ -116,7 +118,7 @@ public Set<String> getIdentifiers(Set<String> idSet) {
 
     public Map<String, String> getMaxLevel(Map<String, String> idSet) {
         if (isLeaf()) {
-            idSet.put(name, parentName);
+            idSet.put(name, sortName == null ? parentName : sortName );
         } else {
             for (HierarchicalCluster child : children) {
                 child.getMaxLevel(idSet);
@@ -140,6 +142,14 @@ public void setName(String name) {
         }
     }
 
+    public String getSortName() {
+        return sortName;
+    }
+
+    public void setSortName(String sortName) {
+        this.sortName = sortName;
+    }
+
     public void addChild(HierarchicalCluster cluster) {
         getChildren().add(cluster);
     }
