diff --git a/TP4_metric.c b/TP4_metric.c index 5e1249c3c089b9c39275f1256cfef6efc47d072a..7c0ae70a705664bef3befa82d36aab565d0c2227 100644 --- a/TP4_metric.c +++ b/TP4_metric.c @@ -134,23 +134,11 @@ unsigned long metric(edgelist *g1, edgelist *g2) ordre_2[i] = i; } - aff_tab(ordre_1, nb_commu_1); - aff_tab(size_commu_1, nb_commu_1); - aff_tab(ordre_2, nb_commu_2); - aff_tab(size_commu_2, nb_commu_2); - - quickSort(ordre_1, size_commu_1, 0, nb_commu_1 - 1); quickSort(ordre_2, size_commu_2, 0, nb_commu_2 - 1); unsigned long ecart = 0; - - aff_tab(ordre_1, nb_commu_1); - aff_tab(size_commu_1, nb_commu_1); - aff_tab(ordre_2, nb_commu_2); - aff_tab(size_commu_2, nb_commu_2); - for (unsigned long i = 0; i < nb_commu_2; i++) { ecart = (size_commu_1[ordre_1[i]] > size_commu_2[ordre_2[i]]) ? (size_commu_1[ordre_1[i]] - size_commu_2[ordre_2[i]]) : (size_commu_2[ordre_2[i]] - size_commu_1[ordre_1[i]]); diff --git a/TP4_q4.c b/TP4_q4.c index ff99a8ca93b00f5c2ba2e8248abdccd1d4f4c568..70ee44bb8ade547043990768f93557ae0e9e6187 100644 --- a/TP4_q4.c +++ b/TP4_q4.c @@ -352,7 +352,7 @@ int main(int argc, char **argv) printf("- Overall time = %ldh%ldm%lds\n", (t2 - t1) / 3600, ((t2 - t1) % 3600) / 60, ((t2 - t1) % 60)); #endif - // srand(time(NULL)); + srand(time(NULL)); unsigned long *res = label_propagation(g);