Commit 031d1a3d authored by marc's avatar marc

vidjil.cpp / model.s : move "diversity" field > needed for fuse.py

fuse.py :output diversity index for multi-samples files with correct padding
models.js : update display
parent 4427b4ac
......@@ -1524,7 +1524,8 @@ int main (int argc, char **argv)
{"run_timestamp", {time_buffer}},
{"producer", {soft_version}},
{"log", {stream_segmentation_info.str()}},
{"commandline", {stream_cmdline.str()}}
{"commandline", {stream_cmdline.str()}},
{"diversity", {jsonDiversity}}
}},
{"reads", {
{"total", {nb_total_reads}},
......@@ -1541,9 +1542,6 @@ int main (int argc, char **argv)
//Added edges in the json output file
j["similarity"] = jsonLevenshtein;
// Diversity measures
j["diversity"] = jsonDiversity;
//$$ Output json, clean
......
......@@ -1102,6 +1102,13 @@ Model.prototype = {
}
}
if ( typeof this.samples.diversity != 'undefined' && typeof this.samples.diversity[timeID] != 'undefined') {
html += "<tr><td class='header' colspan='2'> diversity </td></tr>"
for (var key in this.samples.diversity[timeID]) {
html += "<tr><td> " + key.replace('index_', '') + "</td><td>" + this.samples.diversity[timeID][key].toFixed(3) + '</td></tr>'
}
}
html += "</table></div>"
return html
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment