-

SLList/SLList.cpp

@@ -61,15 +61,21 @@ std::pair<double, int> SLList::distance_avg(SLList* sllist, QImage* img) const
 
   for(unsigned int i = 0 ; i < list1->size(); i++)
     {
+      // std::cout << "--------------------------------------" << std::endl;
+      // std::cout << *(list1->get(i)) << std::endl << std::endl;
       min = list1->get(i)->distance(list2->get(0), img->width(), img->height());
+      // std::cout << *(list2->get(0)) << " -> " << min << std::endl << "Min : " << min << std::endl;
       
       for(unsigned int j = 1 ; j < list2->size(); j++)
 	{
 	  double temp = list1->get(i)->distance(list2->get(j), img->width(), img->height());
+	  // std::cout << *(list2->get(j)) << " -> " << temp << std::endl;
 	  if(temp < min)
 	    min = temp;
+	  // std::cout << "Min : " << min << std::endl;
 	}
       sum += min;
+      // std::cout << std::endl << "Sum : " << sum << std::endl << std::endl;
     }
   return std::make_pair(sum/list1->size(), size()-sllist->size());
 }

SLList/matrice_dispersion.sh

@@ -3,29 +3,31 @@
 qmake
 make
 
-for numImg in {01..34}
+repertoire="../officialTestDirectory/"
+
+for numImg in {01..40}
 do
-    echo "img"$numImg
+    echo $repertoire"img"$numImg".jpg"
     
     premiereLigne=" "
-    for person in "jing" "remiC" "remiS" "samuel"
+    for person in "algo" "jing" "rcozot" "remiS" "samuel"
     do
 	premiereLigne=$premiereLigne";"$person
     done
 
-    echo $premiereLigne > "images/img"$numImg"_mat.csv"
+    echo $premiereLigne > $repertoire"/img"$numImg"_mat.csv"
     
-    for person1 in jing remiC remiS samuel
+    for person1 in algo jing rcozot remiS samuel
     do
 	ligne=$person1
-	for person2 in jing remiC remiS samuel
+	for person2 in algo jing rcozot remiS samuel
 	do
 
-	    ligne=$ligne";"`./sllist "images/img"$numImg"_"$person1".json" "images/img"$numImg"_"$person2".json" "images/img"$numImg".jpg"`
+	    ligne=$ligne";"`./sllist $repertoire"/img"$numImg"_"$person1".json" $repertoire"/img"$numImg"_"$person2".json" $repertoire"/img"$numImg".jpg"`
 	    
 	done
 
-	echo $ligne >> "images/img"$numImg"_mat.csv"
+	echo $ligne >> $repertoire"/img"$numImg"_mat.csv"
 	
     done
     

officialTestDirectory/img01_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 320.0], [2142.0, 680.0]], [[0.0, 2000.0], [2142.0, 1960.0]], [[714.0, 0.0], [1734.0, 2520.0]]]}

officialTestDirectory/img02_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 671.0], [2646.0, 1525.0]], [[0.0, 2135.0], [2646.0, 2135.0]], [[1344.0, 0.0], [1386.0, 3843.0]], [[1092.0, 0.0], [378.0, 3843.0]]]}

officialTestDirectory/img03_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 833.0], [2205.0, 2352.0]], [[2205.0, 0.0], [455.0, 3087.0]]]}

officialTestDirectory/img04_algo.json

@@ -0,0 +1 @@
+{"lines": [[[3234.0, 0.0], [3157.0, 3087.0]], [[0.0, 2548.0], [4851.0, 490.0]], [[0.0, 2352.0], [4851.0, 2303.0]]]}

officialTestDirectory/img05_algo.json

@@ -0,0 +1 @@
+{"lines": [[[726.0, 0.0], [0.0, 1888.0]], [[0.0, 1760.0], [1386.0, 1792.0]], [[528.0, 0.0], [1386.0, 1952.0]]]}

officialTestDirectory/img06_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 984.0], [2394.0, 888.0]]]}

officialTestDirectory/img07_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 96.0], [693.0, 96.0]], [[418.0, 0.0], [363.0, 1008.0]], [[0.0, 32.0], [693.0, 592.0]]]}

officialTestDirectory/img08_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 168.0], [630.0, 147.0]], [[360.0, 0.0], [340.0, 441.0]], [[400.0, 0.0], [630.0, 441.0]]]}

officialTestDirectory/img09_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 546.0], [630.0, 585.0]], [[620.0, 0.0], [0.0, 611.0]], [[230.0, 0.0], [270.0, 819.0]], [[430.0, 0.0], [630.0, 780.0]]]}

officialTestDirectory/img10_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 98.0], [630.0, 210.0]], [[630.0, 161.0], [200.0, 441.0]], [[380.0, 0.0], [290.0, 441.0]]]}

officialTestDirectory/img11_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 258.0], [630.0, 90.0]]]}

officialTestDirectory/img12_algo.json

@@ -0,0 +1 @@
+{"lines": [[[720.0, 0.0], [90.0, 2016.0]], [[0.0, 1824.0], [1134.0, 1792.0]], [[810.0, 0.0], [954.0, 2016.0]], [[0.0, 448.0], [1134.0, 352.0]]]}

officialTestDirectory/img13_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 371.0], [630.0, 371.0]], [[310.0, 0.0], [340.0, 441.0]]]}

officialTestDirectory/img14_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 399.0], [630.0, 182.0]]]}

officialTestDirectory/img15_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 108.0], [630.0, 42.0]], [[550.0, 0.0], [560.0, 378.0]], [[0.0, 180.0], [630.0, 252.0]], [[330.0, 0.0], [280.0, 378.0]]]}

officialTestDirectory/img16_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 357.0], [630.0, 343.0]], [[120.0, 0.0], [470.0, 441.0]]]}

officialTestDirectory/img17_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 175.0], [630.0, 91.0]], [[410.0, 0.0], [370.0, 441.0]]]}

officialTestDirectory/img18_algo.json

@@ -0,0 +1 @@
+{"lines": [[[350.0, 0.0], [140.0, 441.0]], [[310.0, 0.0], [460.0, 441.0]], [[0.0, 294.0], [630.0, 301.0]]]}

officialTestDirectory/img19_algo.json

@@ -0,0 +1 @@
+{"lines": [[[324.0, 0.0], [63.0, 693.0]]]}

officialTestDirectory/img20_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 144.0], [756.0, 144.0]], [[288.0, 0.0], [348.0, 1134.0]]]}

officialTestDirectory/img21_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 117.0], [1134.0, 585.0]], [[1044.0, 0.0], [1134.0, 819.0]], [[684.0, 0.0], [756.0, 819.0]]]}

officialTestDirectory/img22_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 140.0], [819.0, 530.0]], [[650.0, 0.0], [182.0, 630.0]], [[221.0, 0.0], [221.0, 630.0]], [[702.0, 0.0], [533.0, 630.0]]]}

officialTestDirectory/img23_algo.json

@@ -0,0 +1 @@
+{"lines": [[[192.0, 0.0], [0.0, 1952.0]], [[0.0, 768.0], [2016.0, 992.0]], [[1760.0, 0.0], [1888.0, 2016.0]], [[832.0, 0.0], [1344.0, 2016.0]]]}

officialTestDirectory/img24_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 78.0], [630.0, 78.0]], [[400.0, 0.0], [0.0, 336.0]], [[230.0, 0.0], [630.0, 366.0]]]}

officialTestDirectory/img25_algo.json

@@ -0,0 +1 @@
+{"lines": [[[180.0, 0.0], [630.0, 434.0]], [[0.0, 175.0], [630.0, 413.0]], [[630.0, 364.0], [0.0, 441.0]], [[0.0, 182.0], [630.0, 189.0]]]}

officialTestDirectory/img26_algo.json

@@ -0,0 +1 @@
+{"lines": [[[377.0, 0.0], [455.0, 630.0]], [[0.0, 280.0], [819.0, 120.0]], [[0.0, 530.0], [819.0, 430.0]]]}

officialTestDirectory/img27_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 380.0], [756.0, 95.0]], [[456.0, 0.0], [324.0, 1197.0]]]}

officialTestDirectory/img28_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 315.0], [630.0, 301.0]], [[130.0, 0.0], [150.0, 441.0]]]}

officialTestDirectory/img29_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 78.0], [1008.0, 117.0]], [[512.0, 0.0], [240.0, 819.0]], [[0.0, 520.0], [1008.0, 689.0]], [[80.0, 0.0], [0.0, 741.0]]]}

officialTestDirectory/img30_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 259.0], [630.0, 63.0]], [[0.0, 252.0], [630.0, 406.0]]]}

officialTestDirectory/img31_algo.json

@@ -0,0 +1 @@
+{"lines": [[[620.0, 0.0], [0.0, 175.0]], [[580.0, 0.0], [180.0, 441.0]], [[310.0, 0.0], [580.0, 441.0]], [[180.0, 0.0], [330.0, 441.0]]]}

officialTestDirectory/img32_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 175.0], [630.0, 175.0]], [[50.0, 0.0], [580.0, 441.0]], [[450.0, 0.0], [60.0, 441.0]]]}

officialTestDirectory/img33_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 217.0], [630.0, 224.0]], [[290.0, 0.0], [310.0, 441.0]]]}

officialTestDirectory/img34_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 351.0], [1008.0, 377.0]], [[1008.0, 403.0], [144.0, 819.0]]]}

officialTestDirectory/img35_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 435.0], [1197.0, 1392.0]], [[912.0, 0.0], [1026.0, 1827.0]], [[589.0, 0.0], [494.0, 1827.0]]]}

officialTestDirectory/img36_algo.json

@@ -0,0 +1 @@
+{"lines": [[[1197.0, 0.0], [684.0, 945.0]], [[570.0, 0.0], [570.0, 945.0]], [[0.0, 420.0], [1197.0, 510.0]]]}

officialTestDirectory/img37_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 1750.0], [1827.0, 1540.0]], [[1566.0, 0.0], [348.0, 2205.0]], [[1653.0, 0.0], [1769.0, 2205.0]], [[0.0, 280.0], [348.0, 2205.0]], [[377.0, 0.0], [1624.0, 2205.0]], [[0.0, 700.0], [1827.0, 210.0]]]}

officialTestDirectory/img38_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 2058.0], [3591.0, 2142.0]], [[0.0, 504.0], [3363.0, 2646.0]]]}

officialTestDirectory/img39_algo.json

@@ -0,0 +1 @@
+{"lines": [[[0.0, 768.0], [1260.0, 496.0]], [[0.0, 304.0], [1260.0, 272.0]], [[1160.0, 0.0], [1160.0, 1008.0]]]}

officialTestDirectory/img40_algo.json

@@ -0,0 +1 @@
+{"lines": [[[522.0, 0.0], [203.0, 2079.0]], [[0.0, 825.0], [1827.0, 1914.0]]]}