diff --git a/makefile b/makefile index 0e5edd201a25da191145e768a9f591b32cea2c9b..785debef193214baeec3b05ed80bbf16978bdd37 100644 --- a/makefile +++ b/makefile @@ -1,7 +1,7 @@ caml_file := coef_to_csv csv caml_need_csv := point_assos_to_gephi graph_export caml_to_run := coef_to_csv. point_assos_to_gephi. graph_export. -gefx_to_test := mynetwork +gefx_to_test := graphe_assos_actif_frantome graphe_assos_actif graphe_eleve_vs_fantome all: compile run clean test compile: init $(caml_file) $(caml_need_csv) complete_compile @@ -41,11 +41,11 @@ init_test: @echo "Testing gefx file format" $(gefx_to_test): - @echo "testing $@.gefx" + @echo "testing $@.gexf" @cd test_format;xmllint --noout --schema gexf.xsd ../res_script/$@.gexf end_test: - @echo "All gefx have been tested\nTest Completed\n" + @echo "All gexf have been tested\nTest Completed\n" diff --git a/script/src/graph_export.ml b/script/src/graph_export.ml index fc5dcc91fc09001ede2a0bd31c34957729a95380..9183b7896bec41670f76e38c6a1484e23077fc8a 100644 --- a/script/src/graph_export.ml +++ b/script/src/graph_export.ml @@ -88,10 +88,20 @@ let () = begin (*Id,Label,Categorie*) let edge_data = Csv.open_as_csv "../../res_script/edges_avec_fantome.csv" in (*Source,Target,Type,Id,Weight*) - create_gexf "../../res_script/mynetwork.gexf" node_data edge_data; + create_gexf "../../res_script/graphe_assos_actif_frantome.gexf" node_data edge_data; + + let node_data = Csv.open_as_csv "../../res_script/nodes_sans_fantome.csv" in + (*Id,Label,Categorie*) + let edge_data = Csv.open_as_csv "../../res_script/edges_sans_fantome.csv" in + (*Source,Target,Type,Id,Weight*) + create_gexf "../../res_script/graphe_assos_actif.gexf" node_data edge_data; + + let node_data = Csv.open_as_csv "../../res_script/nodes_eleve_vs_fantome.csv" in + (*Id,Label,Categorie*) + let edge_data = Csv.open_as_csv "../../res_script/edges_eleve_vs_fantome.csv" in + (*Source,Target,Type,Id,Weight*) + create_gexf "../../res_script/graphe_eleve_vs_fantome.gexf" node_data edge_data; - - print_endline "Graphes exporté au bon format avec succès" end