Attention une mise à jour du serveur va être effectuée le lundi 17 mai entre 13h et 13h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 3565488c authored by Mathieu Giraud's avatar Mathieu Giraud

vidjil.cpp: calls .computeDiversity() and uses the resulting json

The diversity measures are computed before taking into account the '-r', '-y' and '-z' options,
and before any further clusterisation.
parent e93eac3f
......@@ -1112,12 +1112,15 @@ int main (int argc, char **argv)
//////////////////////////////////
string f_all_windows = out_dir + f_basename + WINDOWS_FILENAME;
cout << " ==> " << f_all_windows << endl ;
cout << " ==> " << f_all_windows << endl << endl ;
ofstream out_all_windows(f_all_windows.c_str());
windowsStorage->printSortedWindows(out_all_windows);
//$$ compute, display and store diversity measures
json jsonDiversity = windowsStorage->computeDiversity(nb_segmented);
//////////////////////////////////
//$$ min_reads_clone (ou label)
......@@ -1523,6 +1526,10 @@ int main (int argc, char **argv)
//Added edges in the json output file
j["similarity"] = jsonLevenshtein;
// Diversity measures
j["diversity"] = jsonDiversity;
out_json << j.dump(2);
delete multigermline ;
delete windowsStorage;
......
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