diff --git a/app/assets/javascripts/pd.js b/app/assets/javascripts/pd.js
index d45af56..5adc139 100644
--- a/app/assets/javascripts/pd.js
+++ b/app/assets/javascripts/pd.js
@@ -78,8 +78,6 @@ global.pd.fn.handle_newick_string = function (newick_string, group_string) {
}
}
});
-
- console.log(group_membership);
}
else {
alert("Upload a group file!");
@@ -101,23 +99,21 @@ global.pd.fn.handle_newick_string = function (newick_string, group_string) {
global.pd.tree = tree;
global.pd.leaves = tree.leaves();
- // tree.leaves().map(function (d) {
- // console.log(d.data.name + " " + global.pd.fn.len_to_root(d));
- // });
- //
- // console.log(global.pd.fn.avg_len_to_root(tree.leaves()));
-
var results = $("#" + global.pd.html.id.results);
results.empty();
- fn.obj.each(group_membership, function (group, names) {
- console.log(group);
- console.log(names);
+ results.append(
+ "
" +
+ "Group | " +
+ "PhyloDist | " +
+ "NormPhyloDist | " +
+ "
"
+ );
+ fn.obj.each(group_membership, function (group, names) {
var dist = global.pd.fn.avg_phylo_dist(tree.leaves(), names);
- var result_str = "Group " + group + ": " + fn.math.round(dist, 2) + " (" + fn.math.round(dist / names.length, 2) + ")";
- results.append("" + result_str + "
");
+ results.append("" + group + " | " + fn.math.round(dist, 2) + " | " + fn.math.round(dist / names.length, 2) + " |
");
});
};
@@ -188,8 +184,6 @@ global.pd.fn.avg_phylo_dist = function (leaves, names) {
}
}
else {
- alert("Not all names had an associated node.");
-
return -1;
}
diff --git a/app/views/pages/pd.html.slim b/app/views/pages/pd.html.slim
index d25b94f..7db4939 100644
--- a/app/views/pages/pd.html.slim
+++ b/app/views/pages/pd.html.slim
@@ -14,9 +14,11 @@
input id="pd-submit" type="button" value="Submit!"
.row
- h4 Results
+ h2 Results
+
+.row
+ table#pd-results
- #pd-results
javascript:
global.pd.fn.main();
\ No newline at end of file