Merge remote-tracking branch 'origin/master'

LFR-Benchmark_UndirWeightOvp-master/seed.txt

-20170527015835
+20170527015836

TP4_metric.c

@@ -90,7 +90,13 @@ unsigned long *size_commu(edgelist *g, unsigned long size)
 
 	for (unsigned long i = 0; i < g->e; i++)
 	{
-		res[g->edges[i].t]++;
+		if (g->edges[i].t == 0)
+		{
+			printf("Il ne faut pas de communauté 0\n");
+			exit(1);
+		}
+		
+		res[g->edges[i].t - 1]++;
 	}
 
 	return res;
@@ -128,29 +134,33 @@ 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;
-	printf("nb_commu_1 : %lu\n", nb_commu_1);
-	printf("nb_commu_2 : %lu\n", nb_commu_2);
 
 
+	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]]);
 		distance += ecart * ecart;
-		printf("ecart : %lu\n", ecart);
-		printf("distance : %lu\n", distance);
 	}
 
 	for (unsigned long i = nb_commu_2; i < nb_commu_1; i++)
 	{
 		ecart = size_commu_1[ordre_1[i]];
 		distance += ecart * ecart;
-		printf("ecart : %lu\n", ecart);
-		printf("distance : %lu\n", distance);
 	}
 
 	free(size_commu_1);

small_test.txt

-0	1
-0	7
-0	25
-1	2
-1	4
-1	5
-1	7
-1	9
-1	13
-1	34
-2	4
-2	7
-2	8
-2	9
-2	11
-2	28
-3	4
-3	7
-3	12
-3	36
-4	7
-4	8
-4	9
-5	7
-5	8
-5	9
-5	25
-6	8
-6	9
-6	21
-6	27
-6	36
-9	11
-9	27
-10	12
-10	13
-10	15
-10	16
-10	17
-10	18
-10	34
-11	15
-11	19
-12	14
-12	17
-12	18
-12	30
-12	33
-13	14
-13	15
-13	16
-13	18
-13	38
-14	17
-15	17
-15	19
-15	24
-16	17
-16	38
-19	39
-20	26
-20	27
-20	36
-21	23
-21	25
-21	28
-22	23
-22	24
-22	25
-22	31
-24	25
-24	39
-26	28
-27	28
-28	31
-30	33
-30	36
-31	36
-32	38
-32	39
-33	35
-34	35
-34	39
-35	37
-36	39
-37	38
-37	39
-38	39
+0   1
+1   1
+2   1
+3   1
+4   1
+5   1
+6   1
+7   1
+8   1
+9   1
+10  2
+11  2
+12  3
+13  3
+14  3
+15  3
+16  3
+17  4
+18  4
+19  4
+20  4
+21  4
+22  5
+23  5
+24  5
+25  5
+26  5
+27  5
+28  5
+29  5