Update types for new settings

dist/visualizations/heatmap/HeatmapSettings.d.ts

@@ -1,6 +1,8 @@
-import Settings from "./../../settings";
+import Settings from "./../../Settings";
 import HeatmapFeature from "./HeatmapFeature";
 import HeatmapValue from "./HeatmapValue";
+import Clusterer from "./cluster/Clusterer";
+import Reorderer from "./reorder/Reorderer";
 export default class HeatmapSettings extends Settings {
     /**
      * The amount of pixels that can maximally be used for row labels when initially rendering the heatmap.
@@ -92,6 +94,8 @@ export default class HeatmapSettings extends Settings {
      * Color of the lines used to construct a dendrogram (must be a valid HTML color string).
      */
     dendrogramColor: string;
+    clusteringAlgorithm: Clusterer;
+    reorderer: Reorderer;
     /**
      * Returns the html to use as tooltip for a cell. Is called with a HeatmapValue that represents the current cell and
      * the row and column objects associated with the highlighted cell as parameters. The result of getTooltipTitle is

dist/visualizations/heatmap/cluster/index.d.ts

@@ -0,0 +1,4 @@
+import Clusterer from "./Clusterer";
+import UPGMAClusterer from "./UPGMAClusterer";
+import TreeNode from "./TreeNode";
+export { Clusterer, UPGMAClusterer, TreeNode };

dist/visualizations/heatmap/index.d.ts

@@ -3,3 +3,6 @@ import HeatmapValue from "./HeatmapValue";
 import HeatmapSettings from "./HeatmapSettings";
 import HeatmapFeature from "./HeatmapFeature";
 export { Heatmap, HeatmapValue, HeatmapFeature, HeatmapSettings };
+export * from "./cluster/index";
+export * from "./metric/index";
+export * from "./reorder/index";

dist/visualizations/heatmap/reorder/index.d.ts

@@ -0,0 +1,3 @@
+import Reorderer from "./Reorderer";
+import MoloReorderer from "./MoloReorderer";
+export { Reorderer, MoloReorderer };

src/visualizations/heatmap/Heatmap.ts

@@ -265,8 +265,8 @@ export default class Heatmap {
     }
 
     private computeClusterRoots() {
-        let clusterer = new UPGMAClusterer(new EuclidianDistanceMetric());
-        let molo: Reorderer = new MoloReorderer();
+        let clusterer = this.settings.clusteringAlgorithm;
+        let molo: Reorderer = this.settings.reorderer;
 
         // Create a new ClusterElement for every row that exists. This ClusterElement keeps track of an array of
         // numbers that correspond to a row's values.

src/visualizations/heatmap/HeatmapSettings.ts

@@ -1,7 +1,12 @@
-import Settings from "./../../settings";
+import Settings from "./../../Settings";
 import HeatmapFeature from "./HeatmapFeature";
 import HeatmapValue from "./HeatmapValue";
 import { Transition } from "./../../transition/Transition";
+import Clusterer from "./cluster/Clusterer";
+import UPGMAClusterer from "./cluster/UPGMAClusterer";
+import EuclidianDistanceMetric from "./metric/EuclidianDistanceMetric";
+import MoloReorderer from "./reorder/MoloReorderer";
+import Reorderer from "./reorder/Reorderer";
 
 export default class HeatmapSettings extends Settings {
     /**
@@ -114,6 +119,10 @@ export default class HeatmapSettings extends Settings {
      */
     dendrogramColor: string = "#404040";
 
+    clusteringAlgorithm: Clusterer = new UPGMAClusterer(new EuclidianDistanceMetric());
+
+    reorderer: Reorderer = new MoloReorderer();
+
     /**
      * Returns the html to use as tooltip for a cell. Is called with a HeatmapValue that represents the current cell and
      * the row and column objects associated with the highlighted cell as parameters. The result of getTooltipTitle is

src/visualizations/heatmap/index.ts

@@ -4,6 +4,6 @@ import HeatmapSettings from "./HeatmapSettings";
 import HeatmapFeature from "./HeatmapFeature";
 
 export { Heatmap, HeatmapValue, HeatmapFeature, HeatmapSettings }
-export * from "./cluster";
-export * from "./metric";
-export * from "./reorder";
+export * from "./cluster/index";
+export * from "./metric/index";
+export * from "./reorder/index";

types/visualizations/heatmap/HeatmapSettings.d.ts

@@ -1,6 +1,8 @@
-import Settings from "./../../settings";
+import Settings from "./../../Settings";
 import HeatmapFeature from "./HeatmapFeature";
 import HeatmapValue from "./HeatmapValue";
+import Clusterer from "./cluster/Clusterer";
+import Reorderer from "./reorder/Reorderer";
 export default class HeatmapSettings extends Settings {
     /**
      * The amount of pixels that can maximally be used for row labels when initially rendering the heatmap.
@@ -92,6 +94,8 @@ export default class HeatmapSettings extends Settings {
      * Color of the lines used to construct a dendrogram (must be a valid HTML color string).
      */
     dendrogramColor: string;
+    clusteringAlgorithm: Clusterer;
+    reorderer: Reorderer;
     /**
      * Returns the html to use as tooltip for a cell. Is called with a HeatmapValue that represents the current cell and
      * the row and column objects associated with the highlighted cell as parameters. The result of getTooltipTitle is

types/visualizations/heatmap/cluster/index.d.ts

@@ -0,0 +1,4 @@
+import Clusterer from "./Clusterer";
+import UPGMAClusterer from "./UPGMAClusterer";
+import TreeNode from "./TreeNode";
+export { Clusterer, UPGMAClusterer, TreeNode };

types/visualizations/heatmap/index.d.ts

@@ -3,3 +3,6 @@ import HeatmapValue from "./HeatmapValue";
 import HeatmapSettings from "./HeatmapSettings";
 import HeatmapFeature from "./HeatmapFeature";
 export { Heatmap, HeatmapValue, HeatmapFeature, HeatmapSettings };
+export * from "./cluster/index";
+export * from "./metric/index";
+export * from "./reorder/index";

types/visualizations/heatmap/reorder/index.d.ts

@@ -0,0 +1,3 @@
+import Reorderer from "./Reorderer";
+import MoloReorderer from "./MoloReorderer";
+export { Reorderer, MoloReorderer };