distance computation and csl v1.3 update

SLList/Main.cpp

@@ -1,17 +1,15 @@
 #include <iostream>
 #include <QImage>
+#include <vector>
+#include <QString>
 #include "SLList.hpp"
 
-void usage(char** argv)
-{
-  std::cout << "usage : " << argv[0] << " json1 json2 image" << std::endl;
-}
 
 int main(int argc, char** argv)
 {
-  if(argc!=4)
+  /*if(argc!=4)
     {
-      usage(argv);
+      std::cout << "usage : " << argv[0] << " json1 json2 image" << std::endl;
       return EXIT_FAILURE;
     }
 
@@ -21,8 +19,42 @@ int main(int argc, char** argv)
   SLList sll1(fichier1);
   SLList sll2(fichier2);
   QImage img(argv[3]);
-  std::pair<double, int> resultat = sll1.distance_avg(&sll2, &img);
-  std::cout << "( " << resultat.first << " , " << resultat.second << " )" << std::endl;
-  //resultat = sll1.distance_hausdorff(&sll2, &img);
-  //std::cout << "( " << resultat.first << " , " << resultat.second << " )" << std::endl;
+  std::pair<double, int> resultat = SLList::distance(&sll1, &sll2, &img);
+  std::cout << "( " << resultat.first << " , " << resultat.second << " )" << std::endl;*/
+
+  std::string path="../officialTestDirectory/img";
+  std::vector<std::string> numImg;
+  std::vector<std::string> nomExpert;
+  
+  for(unsigned int i=1; i<10; i++)
+    numImg.push_back(std::string("0").append(std::to_string(i)));
+  for(unsigned int i=10; i<41; i++)
+    numImg.push_back(std::to_string(i));
+  
+  nomExpert.push_back("algo");
+  nomExpert.push_back("jing");
+  nomExpert.push_back("rcozot");
+  nomExpert.push_back("remiS");
+  nomExpert.push_back("samuel");
+
+  for(unsigned int i=0; i<numImg.size(); i++)
+    {
+      QImage img(std::string(path).append(numImg[i]).append(".jpg").c_str());
+      SLList listA(std::string(path).append(numImg[i]).append("_").append(nomExpert[1]).append(".json"));
+      SLList listB(std::string(path).append(numImg[i]).append("_").append(nomExpert[2]).append(".json"));
+      SLList listC(std::string(path).append(numImg[i]).append("_").append(nomExpert[3]).append(".json"));
+      SLList listD(std::string(path).append(numImg[i]).append("_").append(nomExpert[4]).append(".json"));
+      std::pair<double, int> dAB = SLList::distance(&listA, &listB, &img);
+      std::pair<double, int> dAC = SLList::distance(&listA, &listC, &img);
+      std::pair<double, int> dAD = SLList::distance(&listA, &listD, &img);
+      std::pair<double, int> dBC = SLList::distance(&listB, &listC, &img);
+      std::pair<double, int> dBD = SLList::distance(&listB, &listD, &img);
+      std::pair<double, int> dCD = SLList::distance(&listC, &listD, &img);
+      std::cout << "--------" << numImg[i] << "--------" << std::endl;
+      std::cout << "Score A - Jing   : " << std::get<0>(dAB)+std::get<0>(dAC)+std::get<0>(dAD) << std::endl;
+      std::cout << "Score B - rcozot : " << std::get<0>(dAB)+std::get<0>(dBC)+std::get<0>(dBD) << std::endl;
+      std::cout << "Score C - remiS  : " << std::get<0>(dAC)+std::get<0>(dBC)+std::get<0>(dCD) << std::endl;
+      std::cout << "Score D - samuel : " << std::get<0>(dAD)+std::get<0>(dBD)+std::get<0>(dCD) << std::endl;
+      std::cout << std::endl << std::endl << std::endl;
+    }
 }

SLList/SLList.cpp

@@ -27,6 +27,7 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <vector>
+#include <cmath>
 
 #include "SLList.hpp"
 
@@ -83,6 +84,14 @@ std::pair<double, int> SLList::distance_avg(SLList* sllist, QImage* img) const
   return std::make_pair(sum, size()-sllist->size());
 }
 
+std::pair<double, int> SLList::distance(SLList* sllist1, SLList* sllist2, QImage* img)
+{
+  std::pair<double, int> d1 = sllist1->distance_avg(sllist2, img);
+  std::pair<double, int> d2 = sllist2->distance_avg(sllist1, img);
+
+  return std::make_pair((std::get<0>(d1)+std::get<0>(d2))/2, abs(std::get<1>(d1)));
+}
+
 /*
 std::pair<double, int> SLList::distance_hausdorff(SLList* sllist, QImage* img) const
 {

SLList/SLList.hpp

@@ -44,6 +44,7 @@ public:
   inline unsigned int size() const{return list.size();}
   inline StrengthLine* get(unsigned int i) const{return list.at(i);}
   std::pair<double, int> distance_avg(SLList*, QImage*) const;
+  static std::pair<double, int> distance(SLList*, SLList*, QImage*);
   // std::pair<double, int> distance_hausdorff(SLList*, QImage*) const;
 };
 

officialTestDirectory/img01_expert.json

@@ -2,32 +2,32 @@
     "lines": [
         [
             [
-                474.0767824497258,
-                481.97806215722125
+                419.2103825136612,
+                761.6639344262295
             ],
             [
-                1833.09689213894,
-                2050.3820840950643
+                1647.3196721311476,
+                1983.8688524590166
             ]
         ],
         [
             [
-                142.22303473491775,
-                1991.1224862888484
+                1768.3592896174864,
+                587.4849726775957
             ],
             [
-                1963.4680073126144,
-                2014.8263254113347
+                1012.5997267759564,
+                2042.912568306011
             ]
         ],
         [
             [
-                1710.6270566727605,
-                770.3747714808045
+                484.1584699453552,
+                566.8196721311476
             ],
             [
-                1039.018281535649,
-                1864.7020109689215
+                1541.0409836065573,
+                847.2773224043716
             ]
         ]
     ]

officialTestDirectory/img02_expert.json

@@ -2,22 +2,32 @@
     "lines": [
         [
             [
-                1132.9383561643835,
-                848.5753424657535
+                253.34553775743706,
+                2183.5972540045764
             ],
             [
-                1141.9657534246576,
-                3249.86301369863
+                2364.5583524027456,
+                2189.6292906178487
             ]
         ],
         [
             [
-                81.24657534246575,
-                2134.9794520547944
+                802.2608695652174,
+                820.3569794050343
             ],
             [
-                2626.972602739726,
-                2080.8150684931506
+                2032.7963386727688,
+                1538.1693363844392
+            ]
+        ],
+        [
+            [
+                1134.0228832951943,
+                705.7482837528604
+            ],
+            [
+                1127.9908466819222,
+                2539.487414187643
             ]
         ]
     ]

officialTestDirectory/img03_expert.json

@@ -2,32 +2,32 @@
     "lines": [
         [
             [
-                623.8805970149253,
-                963.18407960199
+                570.7317073170732,
+                926.829268292683
             ],
             [
-                1838.8059701492537,
-                2327.6948590381426
+                1785.3658536585367,
+                2424.390243902439
             ]
         ],
         [
             [
-                2108.7893864013267,
-                1306.1359867330016
+                531.7073170731708,
+                175.609756097561
             ],
             [
-                94.85903814262022,
-                1233.167495854063
+                521.9512195121952,
+                2214.6341463414637
             ]
         ],
         [
             [
-                923.0514096185738,
-                2670.646766169154
+                478.0487804878049,
+                2360.9756097560976
             ],
             [
-                711.4427860696517,
-                926.6998341625207
+                1843.9024390243903,
+                2365.8536585365855
             ]
         ]
     ]

officialTestDirectory/img05_expert.json

@@ -2,22 +2,22 @@
     "lines": [
         [
             [
-                70.71058823529411,
-                1806.3341176470587
+                718.8216783216783,
+                451.3531468531468
             ],
             [
-                662.1082352941175,
-                212.13176470588235
+                140.8986013986014,
+                1726.6048951048951
             ]
         ],
         [
             [
-                764.9599999999999,
-                311.76941176470586
+                721.2097902097902,
+                415.53146853146853
             ],
             [
-                1173.1529411764704,
-                1893.115294117647
+                967.1853146853147,
+                1743.3216783216783
             ]
         ]
     ]

officialTestDirectory/img08_expert.json

@@ -2,22 +2,22 @@
     "lines": [
         [
             [
-                102.53403141361257,
-                172.2303664921466
+                126.29600626468284,
+                169.8981989036805
             ],
             [
-                538.1361256544502,
-                172.90052356020942
+                430.007830853563,
+                178.9193422083007
             ]
         ],
         [
             [
-                411.4764397905759,
-                55.62303664921466
+                399.93735317149566,
+                84.19733750978857
             ],
             [
-                412.14659685863876,
-                331.72774869109946
+                403.44557556773685,
+                376.8833202819107
             ]
         ]
     ]

officialTestDirectory/img09_expert.json

@@ -2,32 +2,22 @@
     "lines": [
         [
             [
-                439.0124416796268,
-                159.72783825816487
+                241.88284518828453,
+                106.7887029288703
             ],
             [
-                290.76205287713844,
-                325.194401244168
+                587.9811715481171,
+                468.326359832636
             ]
         ],
         [
             [
-                383.538102643857,
-                31.562986003110424
+                550.6694560669456,
+                66.90376569037657
             ],
             [
-                583.4370139968896,
-                483.0093312597201
-            ]
-        ],
-        [
-            [
-                567.1772939346812,
-                534.6578538102644
-            ],
-            [
-                43.04043545878694,
-                366.3219284603422
+                146.67364016736403,
+                460.60669456066944
             ]
         ]
     ]

officialTestDirectory/img10_expert.json

@@ -2,22 +2,22 @@
     "lines": [
         [
             [
-                38.88774459320289,
-                105.45829042224511
+                3.9792746113989637,
+                103.46113989637306
             ],
             [
-                518.7229660144181,
-                183.23377960865088
+                545.8238341968912,
+                188.3523316062176
             ]
         ],
         [
             [
-                543.1101956745623,
-                216.8486096807415
+                224.82901554404145,
+                414.5077720207254
             ],
             [
-                263.6457260556128,
-                392.83213182286306
+                552.4559585492228,
+                209.57512953367876
             ]
         ]
     ]

officialTestDirectory/img11_expert.json

@@ -2,32 +2,32 @@
     "lines": [
         [
             [
-                393.2327868852459,
-                225.36393442622952
+                17.49559082892416,
+                240.4232804232804
             ],
             [
-                283.27868852459017,
-                107.01639344262296
+                603.31569664903,
+                235.90828924162255
             ]
         ],
         [
             [
-                280.34098360655736,
-                115.40983606557377
+                281.62257495590825,
+                108.35978835978835
             ],
             [
-                173.32459016393443,
-                217.39016393442623
+                136.01410934744268,
+                305.326278659612
             ]
         ],
         [
             [
-                15.947540983606558,
-                236.69508196721313
+                287.2663139329806,
+                103.8447971781305
             ],
             [
-                583.344262295082,
-                227.88196721311476
+                499.47089947089944,
+                306.4550264550264
             ]
         ]
     ]

officialTestDirectory/img15_expert.json

@@ -2,22 +2,32 @@
     "lines": [
         [
             [
-                60.41958041958042,
-                94.54545454545455
+                113.85219097449313,
+                87.90058862001308
             ],
             [
-                626.013986013986,
-                81.67832167832168
+                530.3335513407455,
+                75.76193590582079
             ]
         ],
         [
             [
-                153.28671328671328,
-                182.37762237762237
+                112.17789404839765,
+                177.89404839764552
             ],
             [
-                482.7972027972028,
-                288.1118881118881
+                498.5219097449313,
+                320.2092871157619
+            ]
+        ],
+        [
+            [
+                537.4493132766514,
+                59.856115107913666
+            ],
+            [
+                509.404839764552,
+                323.5578809679529
             ]
         ]
     ]

officialTestDirectory/img16_expert.json

@@ -2,22 +2,22 @@
     "lines": [
         [
             [
-                632.5291828793775,
-                337.1828793774319
+                8.702928870292888,
+                342.09205020920507
             ],
             [
-                17.929961089494164,
-                340.1712062256809
+                625.2719665271967,
+                336.73640167364016
             ]
         ],
         [
             [
-                426.83268482490274,
-                343.15953307392994
+                107.11297071129708,
+                3.3472803347280338
             ],
             [
-                140.94941634241246,
-                13.945525291828794
+                423.76569037656907,
+                337.4058577405858
             ]
         ]
     ]

officialTestDirectory/img17_expert.json

@@ -2,32 +2,52 @@
     "lines": [
         [
             [
-                628.1664098613251,
-                98.12018489984591
+                89.73805855161787,
+                159.75346687211092
             ],
             [
-                92.20338983050847,
-                153.34360554699538
+                587.7349768875192,
+                104.03697996918335
             ]
         ],
         [
             [
-                393.959938366718,
-                90.7241910631741
+                377.1956856702619,
+                61.63328197226502
             ],
             [
-                382.61941448382123,
-                386.07087827426807
+                394.9460708782742,
+                384.0986132511556
             ]
         ],
         [
             [
-                158.76733436055468,
-                131.6486902927581
+                82.34206471494606,
+                244.5608628659476
             ],
             [
-                158.76733436055468,
-                315.5624036979969
+                391.98767334360554,
+                391.98767334360554
+            ]
+        ],
+        [
+            [
+                85.30046224961478,
+                135.10015408320493
+            ],
+            [
+                88.2588597842835,
+                259.84591679506934
+            ]
+        ],
+        [
+            [
+                168.13559322033896,
+                100.0924499229584
+            ],
+            [
+                157.78120184899845,
+                279.5685670261941
             ]
         ]
     ]

officialTestDirectory/img18_expert.json

@@ -2,22 +2,22 @@
     "lines": [
         [
             [
-                326.7028704422032,
-                69.51124903025601
+                178.37160751565762,
+                416.8684759916493
             ],
             [
-                182.21877424359968,
-                382.80837858805273
+                330.6889352818372,
+                56.11691022964509
             ]
         ],
         [
             [
-                323.7238169123351,
-                63.55314197051978
+                440.9185803757829,
+                410.8559498956159
             ],
             [
-                426.5011636927851,
-                375.85725368502716
+                334.0292275574113,
+                66.80584551148226
             ]
         ]
     ]

officialTestDirectory/img19_expert.json

@@ -2,32 +2,32 @@
     "lines": [
         [
             [
-                56.89705882352941,
-                618.0735294117648
+                257.9852941176471,
+                130.16176470588235
             ],
             [
-                254.08823529411765,
-                95.86764705882354
+                59.235294117647065,
+                604.8235294117648
             ]
         ],
         [
             [
-                239.27941176470588,
-                84.1764705882353
+                46.76470588235294,
+                627.4264705882354
             ],
             [
-                435.69117647058823,
-                225.25
+                359.30882352941177,
+                209.66176470588238
             ]
         ],
         [
             [
-                63.13235294117647,
-                643.7941176470589
+                234.6029411764706,
+                200.30882352941177
             ],
             [
-                465.30882352941177,
-                200.30882352941177
+                459.8529411764706,
+                240.05882352941177
             ]
         ]
     ]

officialTestDirectory/img22_expert.json

@@ -2,22 +2,22 @@
     "lines": [
         [
             [
-                195.7553058676654,
-                627.2159800249688
+                391.0669975186104,
+                345.409429280397
             ],
             [
-                391.5106117353308,
-                347.5655430711611
+                167.74193548387095,
+                573.697270471464
             ]
         ],
         [
             [
-                421.47315855181023,
-                347.5655430711611
+                428.78411910669973,
+                349.37965260545906
             ],
             [
-                792.0099875156055,
-                537.3283395755305
+                782.1339950372208,
+                535.9801488833747
             ]
         ]
     ]

officialTestDirectory/img24_expert.json

@@ -2,32 +2,32 @@
     "lines": [
         [
             [
-                316.01311475409835,
-                77.63934426229508
+                302.58360655737704,
+                97.3639344262295
             ],
             [
-                83.09508196721312,
-                285.37704918032784
+                66.30819672131148,
+                282.85901639344263
             ]
         ],
         [
             [
-                327.7639344262295,
-                80.99672131147541
+                591.7377049180328,
+                304.6819672131148
             ],
             [
-                588.3803278688524,
-                306.3606557377049
+                345.39016393442625,
+                93.58688524590164
             ]
         ],
         [
             [
-                26.01967213114754,
-                78.05901639344262
+                12.59016393442623,
+                77.63934426229508
             ],
             [
-                591.7377049180328,
-                76.38032786885246
+                580.4065573770491,
+                75.96065573770491
             ]
         ]
     ]

officialTestDirectory/img25_expert.json

@@ -2,22 +2,22 @@
     "lines": [
         [
             [
-                379.08713692946054,
-                190.5394190871369
+                601.9206680584551,
+                369.43632567849687
             ],
             [
-                561.6597510373443,
-                351.86721991701245
+                265.8872651356994,
+                77.49478079331942
             ]
         ],
         [
             [
-                25.89211618257261,
-                184.5643153526971
+                5.34446764091858,
+                176.36743215031316
             ],
             [
-                607.4688796680498,
-                185.22821576763485
+                635.9916492693111,
+                189.06054279749478
             ]
         ]
     ]

officialTestDirectory/img26_expert.json

@@ -2,32 +2,32 @@
     "lines": [
         [
             [
-                240.6015037593985,
-                456.140350877193
+                399.2551210428305,
+                20.85661080074488
             ],
             [
-                515.2882205513785,
-                519.2982456140351
+                643.5754189944134,
+                493.85474860335194
             ]
         ],
         [
             [
-                230.5764411027569,
-                481.203007518797
+                410.42830540037244,
+                8.193668528864059
             ],
             [
-                413.03258145363407,
-                204.5112781954887
+                155.67970204841714,
+                490.13035381750467
             ]
         ],
         [
             [
-                396.9924812030075,
-                180.45112781954887
+                175.79143389199254,
+                513.9664804469273
             ],
             [
-                558.3959899749373,
-                573.4335839598997
+                605.586592178771,
+                513.9664804469273
             ]
         ]
     ]

officialTestDirectory/img28_expert.json

@@ -2,22 +2,22 @@
     "lines": [
         [
             [
-                21.34988363072149,
-                310.8145849495733
+                31.203319502074688,
+                305.3941908713693
             ],
             [
-                571.978277734678,
-                305.35298681148174
+                599.5020746887966,
+                304.0663900414938
             ]
         ],
         [
             [
-                150.93871217998446,
-                175.26764934057408
+                148.04979253112032,
+                175.26970954356847
             ],
             [
-                148.95267649340573,
-                299.3948797517455
+                144.73029045643153,
+                295.4356846473029
             ]
         ]
     ]

officialTestDirectory/img29_expert.json

@@ -2,32 +2,32 @@
     "lines": [
         [
             [
-                244.0711678832117,
-                234.75547445255475
+                283.12392638036806,
+                263.07975460122697
             ],
             [
-                802.0812043795621,
-                192.83485401459856
+                544.9509202453987,
+                666.4687116564417
             ]
         ],
         [
             [
-                854.2490875912409,
-                212.39781021897812
+                256.81595092024537,
+                280.61840490797545
             ],
             [
-                544.036496350365,
-                696.8138686131388
+                909.5042944785275,
+                229.25521472392637
             ]
         ],
         [
             [
-                511.43156934306575,
-                704.2664233576643
+                859.3938650306749,
+                179.1447852760736
             ],
             [
-                193.76642335766425,
-                269.2235401459854
+                544.9509202453987,
+                631.3914110429448
             ]
         ]
     ]

officialTestDirectory/img31_expert.json

@@ -2,22 +2,22 @@
     "lines": [
         [
             [
-                2.67223382045929,
-                221.7954070981211
+                517.8423236514523,
+                34.522821576763484
             ],
             [
-                516.4091858037579,
-                40.08350730688935
+                30.539419087136928,
+                171.2863070539419
             ]
         ],
         [
             [
-                247.84968684759917,
-                412.1920668058455
+                524.4813278008298,
+                90.29045643153526
             ],
             [
-                552.4843423799582,
-                35.407098121085596
+                343.9004149377593,
+                353.19502074688796
             ]
         ]
     ]

officialTestDirectory/img32_expert.json

@@ -2,32 +2,32 @@
     "lines": [
         [
             [
-                220.41493775933608,
-                265.5601659751037
+                72.15031315240084,
+                416.8684759916493
             ],
             [
-                104.23236514522821,
-                386.3900414937759
+                370.1043841336117,
+                124.92693110647183
             ]
         ],
         [
             [
-                427.55186721991697,
-                270.8713692946058
+                567.8496868475992,
+                419.54070981210856
             ],
             [
-                553.6929460580913,
-                407.6348547717842
+                256.53444676409185,
+                91.5240083507307
             ]
         ],
         [
             [
-                10.622406639004149,
-                167.9668049792531
+                629.3110647181628,
+                173.02713987473905
             ],
             [
-                624.0663900414937,
-                175.93360995850622
+                8.01670146137787,
+                168.3507306889353
             ]
         ]
     ]

officialTestDirectory/img33_expert.json

@@ -2,42 +2,22 @@
     "lines": [
         [
             [
-                301.3809154383243,
-                268.611326609775
+                3.3402922755741127,
+                216.4509394572025
             ],
             [
-                604.2513576415826,
-                381.8153607447634
+                637.3277661795407,
+                220.45929018789144
             ]
         ],
         [
             [
-                313.7936384794414,
-                276.55546935609
+                316.6597077244259,
+                411.5240083507307
             ],
             [
-                44.189294026377034,
-                359.9689681923972
-            ]
-        ],
-        [
-            [
-                16.881303335919316,
-                220.44996121024047
-            ],
-            [
-                517.3622963537625,
-                222.43599689681923
-            ]
-        ],
-        [
-            [
-                313.2971295577967,
-                366.92009309542277
-            ],
-            [
-                313.2971295577967,
-                220.44996121024047
+                313.31941544885177,
+                102.88100208768267
             ]
         ]
     ]

officialTestDirectory/img34_expert.json

@@ -2,22 +2,22 @@
     "lines": [
         [
             [
-                6.2439024390243905,
-                342.1658536585366
+                59.57818181818182,
+                382.29333333333335
             ],
             [
-                996.5268292682927,
-                357.1512195121951
+                979.3163636363637,
+                377.32848484848483
             ]
         ],
         [
             [
-                247.25853658536585,
-                777.990243902439
+                881.260606060606,
+                414.5648484848485
             ],
             [
-                1006.5170731707317,
-                362.1463414634146
+                129.0860606060606,
+                770.7927272727272
             ]
         ]
     ]

officialTestDirectory/img35_expert.json

@@ -2,22 +2,32 @@
     "lines": [
         [
             [
-                288,
-                121.41176470588235
+                501.3986013986014,
+                396.5034965034965
             ],
             [
-                1166.1176470588234,
-                1335.5294117647059
+                952.4475524475524,
+                1202.097902097902
             ]
         ],
         [
             [
-                542.1176470588235,
-                64.94117647058823
+                306.2937062937063,
+                1497.902097902098
             ],
             [
-                496.94117647058823,
-                1742.1176470588234
+                555.9440559440559,
+                356.64335664335664
+            ]
+        ],
+        [
+            [
+                73.42657342657343,
+                700.6993006993007
+            ],
+            [
+                1174.8251748251748,
+                539.1608391608391
             ]
         ]
     ]

officialTestDirectory/img36_expert.json

@@ -2,22 +2,42 @@
     "lines": [
         [
             [
-                142.6170468187275,
-                414.8859543817527
+                7.5,
+                427.5
             ],
             [
-                1025.690276110444,
-                446.578631452581
+                1091.7857142857142,
+                417.85714285714283
             ]
         ],
         [
             [
-                597.8391356542617,
-                4.32172869147659
+                590.3571428571429,
+                43.92857142857143
             ],
             [
-                596.3985594237695,
-                903.2412965186074
+                593.5714285714286,
+                678.2142857142857
+            ]
+        ],
+        [
+            [
+                90,
+                324.6428571428571
+            ],
+            [
+                394.2857142857143,
+                69.64285714285714
+            ]
+        ],
+        [
+            [
+                321.42857142857144,
+                35.357142857142854
+            ],
+            [
+                531.4285714285714,
+                264.6428571428571
             ]
         ]
     ]

officialTestDirectory/img37_expert.json

@@ -2,22 +2,22 @@
     "lines": [
         [
             [
-                246.02739726027397,
-                2165.041095890411
+                924.1553398058252,
+                997.3902912621359
             ],
             [
-                1202.0195694716242,
-                530.7162426614482
+                240.62912621359223,
+                2141.250485436893
             ]
         ],
         [
             [
-                1637.839530332681,
-                2200.187866927593
+                1025.2893203883496,
+                948.5669902912621
             ],
             [
-                948.9628180039139,
-                699.4207436399217
+                1523.9844660194174,
+                2148.2252427184467
             ]
         ]
     ]

officialTestDirectory/img38_expert.json

@@ -2,22 +2,22 @@
     "lines": [
         [
             [
-                154.64211737629458,
-                509.90103567318755
+                216.09153318077801,
+                1932.3569794050343
             ],
             [
-                2808.6352128883773,
-                2336.3498273878017
+                3046.0594965675054,
+                1924.045766590389
             ]
         ],
         [
             [
-                112.84695051783659,
-                2110.655926352129
+                648.274599542334,
+                806.1876430205949
             ],
             [
-                3485.716915995397,
-                2123.194476409666
+                1936.512585812357,
+                1770.2883295194508
             ]
         ]
     ]

officialTestDirectory/img39_expert.json

@@ -2,32 +2,52 @@
     "lines": [
         [
             [
-                41.12176165803109,
-                797.1295336787565
+                179.8372093023256,
+                772.5901162790698
             ],
             [
-                1007.4831606217616,
-                548.8173575129533
+                1010.4011627906976,
+                560.8081395348837
             ]
         ],
         [
             [
-                28.468911917098445,
-                311.5764248704663
+                113.5813953488372,
+                524.1308139534884
             ],
             [
-                990.0854922279792,
-                311.5764248704663
+                1039.9796511627908,
+                488.63662790697674
             ]
         ],
         [
             [
-                1129.2668393782383,
-                147.08937823834196
+                62.70639534883721,
+                330.09593023255815
             ],
             [
-                1126.103626943005,
-                746.5181347150259
+                1063.6424418604652,
+                353.7587209302326
+            ]
+        ],
+        [
+            [
+                685.0377906976744,
+                293.4186046511628
+            ],
+            [
+                722.8982558139535,
+                866.0581395348837
+            ]
+        ],
+        [
+            [
+                895.6366279069767,
+                862.5087209302326
+            ],
+            [
+                858.9593023255813,
+                306.4331395348837
             ]
         ]
     ]

officialTestDirectory/img40_expert.json

@@ -2,22 +2,32 @@
     "lines": [
         [
             [
-                1816.9750889679717,
-                1937.455516014235
+                394.0422721268164,
+                652.7080581241744
             ],
             [
-                133.50533807829183,
-                1032.2241992882564
+                1651.1096433289301,
+                1793.7384412153237
             ]
         ],
         [
             [
-                319.11032028469754,
-                39.07473309608541
+                297.3447820343461,
+                1682.536327608983
             ],
             [
-                416.79715302491104,
-                1992.811387900356
+                1561.664464993395,
+                1771.981505944518
+            ]
+        ],
+        [
+            [
+                348.110964332893,
+                664.7952443857332
+            ],
+            [
+                394.0422721268164,
+                1665.6142668428006
             ]
         ]
     ]