More stringent check for joint sort.

Author: stephenshank

src/helpers/jointSort.js

@@ -1,6 +1,6 @@
 import { max } from "d3";
 
-function sortFASTAAndNewick(sequence_data, tree) {
+function sortFASTAAndNewick(sequence_data, tree, strict) {
   var i = 0;
   tree.traverse_and_compute(function(n) {
     var d = 1;
@@ -26,6 +26,20 @@ function sortFASTAAndNewick(sequence_data, tree) {
       b_index = ordered_leaf_names.indexOf(b.header);
     return a_index - b_index;
   });
+  if (strict) {
+    const number_of_leaves = ordered_leaf_names.length,
+      lengths_agree = number_of_leaves == sequence_data.length;
+    if (!lengths_agree) {
+      throw "Different number of leaves and sequences!";
+    }
+    sequence_data.forEach((record, index) => {
+      const leaf = ordered_leaf_names[index],
+        header = record.header;
+      if (leaf != header) {
+        throw `Tree/alignment mismatch at ${i}: ${leaf}/${header}.`;
+      }
+    });
+  }
   return tree;
 }