From: mdim Date: Fri, 12 Feb 2010 14:47:08 +0000 (+0000) Subject: updated testdata (added tsukuba, tuned params) X-Git-Url: https://rtime.felk.cvut.cz/gitweb/opencv.git/commitdiff_plain/5d60f30e6085049e29479764f29955273a2dd87d updated testdata (added tsukuba, tuned params) git-svn-id: https://code.ros.org/svn/opencv/trunk@2685 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08 --- diff --git a/opencv_extra/testdata/cv/stereomatching/algorithms/stereobm_params.xml b/opencv_extra/testdata/cv/stereomatching/algorithms/stereobm_params.xml index 296877e3..740e695f 100644 --- a/opencv_extra/testdata/cv/stereomatching/algorithms/stereobm_params.xml +++ b/opencv_extra/testdata/cv/stereomatching/algorithms/stereobm_params.xml @@ -4,10 +4,11 @@ 1 19 1 39 - 18 19 + 4 7 3 9 1 13 - 11 15 + 3 9 + 1 7 2 43 diff --git a/opencv_extra/testdata/cv/stereomatching/algorithms/stereobm_res.xml b/opencv_extra/testdata/cv/stereomatching/algorithms/stereobm_res.xml index 516ac4ec..aaed1b1e 100644 --- a/opencv_extra/testdata/cv/stereomatching/algorithms/stereobm_res.xml +++ b/opencv_extra/testdata/cv/stereomatching/algorithms/stereobm_res.xml @@ -2,115 +2,123 @@ - 2.9392745494842529e+00 2.7891962528228760e+00 9.0826406478881836e+00 - 2.7078471183776855e+00 - 3.2317843437194824e+00 + 2.6714920997619629e+00 + 3.3159480094909668e+00 5.7306551933288574e+00 1.0922910273075104e-01 9.9349290132522583e-02 9.5564126968383789e-01 - 9.3846537172794342e-02 - 1.3214099407196045e-01 + 9.1345988214015961e-02 + 1.3939268887042999e-01 4.7903308272361755e-01 - 3.0391244888305664e+00 2.9548807144165039e+00 1.3057669639587402e+01 - 3.0047609806060791e+00 - 2.6854543685913086e+00 + 3.0341999530792236e+00 + 2.5804028511047363e+00 4.3863506317138672e+00 8.4752470254898071e-02 8.1879965960979462e-02 9.8732715845108032e-01 - 7.8509137034416199e-02 - 9.9111698567867279e-02 + 7.8182123601436615e-02 + 9.8015159368515015e-02 4.5368170738220215e-01 - - 8.4606559753417969e+01 - 8.4553466796875000e+01 - 1.4799235534667969e+02 - 8.1025100708007812e+01 - 1.0782259368896484e+02 - 1.0799063110351562e+02 + 1.6124673843383789e+01 + 1.4439256668090820e+01 + 3.4613716125488281e+01 + 1.4377423286437988e+01 + 1.6886524200439453e+01 + 2.0171636581420898e+01 - 4.0014129877090454e-01 - 3.9978736639022827e-01 - 9.9653875827789307e-01 - 3.7237781286239624e-01 - 6.0980486869812012e-01 - 7.4758553504943848e-01 + 2.6062533259391785e-01 + 2.2201843559741974e-01 + 9.6128243207931519e-01 + 2.2269524633884430e-01 + 1.9289977848529816e-01 + 4.8368534445762634e-01 - 3.6020145416259766e+00 3.4845609664916992e+00 7.9826788902282715e+00 - 3.2531991004943848e+00 - 5.0362663269042969e+00 + 3.2193512916564941e+00 + 4.9817261695861816e+00 6.2160286903381348e+00 1.6449931263923645e-01 1.5159508585929871e-01 9.5661699771881104e-01 - 1.4315664768218994e-01 - 2.2316744923591614e-01 + 1.3988247513771057e-01 + 2.3509734869003296e-01 3.9724341034889221e-01 - 5.8944001197814941e+00 5.8160881996154785e+00 9.9867839813232422e+00 - 5.8395657539367676e+00 - 5.4267053604125977e+00 + 5.8239169120788574e+00 + 5.7139124870300293e+00 4.2487883567810059e+00 1.9308239221572876e-01 1.8180394172668457e-01 9.7119647264480591e-01 - 1.8286949396133423e-01 - 1.6475760936737061e-01 + 1.8123684823513031e-01 + 1.8913538753986359e-01 3.5565054416656494e-01 - - 8.6181968688964844e+01 - 8.3231674194335938e+01 - 1.2684611511230469e+02 - 7.5399368286132812e+01 - 1.0720892333984375e+02 - 1.1915334320068359e+02 + 1.4010182380676270e+01 + 1.2750345230102539e+01 + 2.9705610275268555e+01 + 1.2518463134765625e+01 + 1.3875877380371094e+01 + 1.7239618301391602e+01 - 5.2709627151489258e-01 - 4.9984502792358398e-01 - 9.9764972925186157e-01 - 4.1251543164253235e-01 - 8.2079863548278809e-01 - 7.9594331979751587e-01 + 2.6770639419555664e-01 + 2.3205143213272095e-01 + 9.9023723602294922e-01 + 2.2320504486560822e-01 + 2.7729755640029907e-01 + 4.8490911722183228e-01 + + + 2.5117847919464111e+00 + 2.4483191967010498e+00 + 5.2020101547241211e+00 + 2.4904835224151611e+00 + 2.3065049648284912e+00 + 5.1833825111389160e+00 + + 1.2156768888235092e-01 + 1.1292581260204315e-01 + 6.8785870075225830e-01 + 1.0524481534957886e-01 + 1.3779740035533905e-01 + 4.3717512488365173e-01 - 3.4050819873809814e+00 3.2371592521667480e+00 1.1204956054687500e+01 - 3.1604993343353271e+00 - 3.4846625328063965e+00 + 3.1021447181701660e+00 + 3.6010367870330811e+00 3.8172011375427246e+00 1.1623481661081314e-01 1.0793885588645935e-01 9.6218025684356689e-01 - 1.0312246531248093e-01 - 1.2427694350481033e-01 + 9.9074363708496094e-02 + 1.3370963931083679e-01 3.9958250522613525e-01 diff --git a/opencv_extra/testdata/cv/stereomatching/algorithms/stereogc_params.xml b/opencv_extra/testdata/cv/stereomatching/algorithms/stereogc_params.xml index 7c5cf8cc..ad5438b0 100644 --- a/opencv_extra/testdata/cv/stereomatching/algorithms/stereogc_params.xml +++ b/opencv_extra/testdata/cv/stereomatching/algorithms/stereogc_params.xml @@ -1,13 +1,14 @@ - - 32 2 1 - 40 2 1 - 40 2 6 - 51 3 1 - 20 3 1 - 30 3 6 - 25 2 1 + + 32 2 + 40 2 + 50 3 + 51 3 + 20 3 + 70 3 + 16 3 + 25 2 diff --git a/opencv_extra/testdata/cv/stereomatching/algorithms/stereogc_res.xml b/opencv_extra/testdata/cv/stereomatching/algorithms/stereogc_res.xml index 3c72046d..b00d56ae 100644 --- a/opencv_extra/testdata/cv/stereomatching/algorithms/stereogc_res.xml +++ b/opencv_extra/testdata/cv/stereomatching/algorithms/stereogc_res.xml @@ -2,115 +2,123 @@ - - 9.4928985834121704e-01 - 9.0197920799255371e-01 - 2.9041461944580078e+00 - 7.0166534185409546e-01 - 1.6519012451171875e+00 - 1.6282123327255249e+00 + 8.8603770732879639e-01 + 7.8308063745498657e-01 + 3.8752806186676025e+00 + 7.2582632303237915e-01 + 1.0224789381027222e+00 + 1.8392300605773926e+00 - 3.5328693687915802e-02 - 2.9424229636788368e-02 - 5.5191254615783691e-01 - 1.9362613558769226e-02 - 8.9412324130535126e-02 - 1.1149543523788452e-01 + 3.3159919083118439e-02 + 2.7169827371835709e-02 + 5.4741239547729492e-01 + 1.8625134602189064e-02 + 6.9922037422657013e-02 + 1.1224113404750824e-01 - - 3.6778658628463745e-01 - 3.6420366168022156e-01 - 1.0077822208404541e+00 - 3.5408842563629150e-01 - 4.1205170750617981e-01 - 9.7981500625610352e-01 + 3.7080153822898865e-01 + 3.6729887127876282e-01 + 1.0052068233489990e+00 + 3.5788035392761230e-01 + 4.0584596991539001e-01 + 9.5839411020278931e-01 - 1.3756513595581055e-02 - 1.3120710849761963e-02 - 2.0852534472942352e-01 - 7.8758532181382179e-03 - 3.9932556450366974e-02 - 1.3994456827640533e-01 + 1.3837000355124474e-02 + 1.3208182528614998e-02 + 2.0737327635288239e-01 + 7.5097181834280491e-03 + 3.8072898983955383e-02 + 1.3895486295223236e-01 - - 1.1709786987304688e+02 - 1.1264179992675781e+02 - 1.2477310180664062e+02 - 1.1264210510253906e+02 - 1.1140579223632812e+02 - 1.0909697723388672e+02 + 3.7308437824249268e+00 + 3.1105630397796631e+00 + 9.5623703002929688e+00 + 3.1101467609405518e+00 + 3.1284358501434326e+00 + 5.4951958656311035e+00 - 9.9993598461151123e-01 - 1. - 9.9990916252136230e-01 - 1. - 1. - 1. + 1.7794829607009888e-01 + 1.4968457818031311e-01 + 6.9263684749603271e-01 + 1.4879696071147919e-01 + 1.8787306547164917e-01 + 2.6704102754592896e-01 - - 5.3581643104553223e-01 - 4.4311472773551941e-01 - 2.4272620677947998e+00 - 4.5470806956291199e-01 - 3.2873508334159851e-01 - 1.1077035665512085e+00 + 4.7286075353622437e-01 + 4.1047108173370361e-01 + 1.9339451789855957e+00 + 4.2168381810188293e-01 + 3.1932061910629272e-01 + 9.7188043594360352e-01 - 7.5475452467799187e-03 - 4.6614543534815311e-03 - 1.8865031003952026e-01 - 5.1959608681499958e-03 - 1.2792630877811462e-04 - 3.8808040320873260e-02 + 4.8060007393360138e-03 + 2.9884576797485352e-03 + 1.2160385400056839e-01 + 3.4076399169862270e-03 + 0. + 2.7874028310179710e-02 - - 1.0963695049285889e+00 - 1.0963695049285889e+00 - 4.4058694839477539e+00 - 1.1118340492248535e+00 - 8.0678206682205200e-01 - 2.7431144714355469e+00 + 1.1101239919662476e+00 + 9.7588479518890381e-01 + 4.5185084342956543e+00 + 9.7688007354736328e-01 + 9.6292138099670410e-01 + 2.4524936676025391e+00 - 1.6633117571473122e-02 - 1.6633117571473122e-02 - 2.9172822833061218e-01 - 1.7207717522978783e-02 - 7.3597053997218609e-03 - 1.1866609007120132e-01 + 1.6968598589301109e-02 + 1.2799737975001335e-02 + 3.0354505777359009e-01 + 1.2960721738636494e-02 + 1.0718011297285557e-02 + 9.4535112380981445e-02 - - 2.0732359313964844e+02 - 2.0732359313964844e+02 - 8.5327537536621094e+01 - 2.0966488647460938e+02 - 9.9806800842285156e+01 - 3.0175250244140625e+02 + 2.3585431575775146e+00 + 2.1146903038024902e+00 + 5.3201212882995605e+00 + 1.8850584030151367e+00 + 3.0281293392181396e+00 + 3.3921070098876953e+00 - 9.9998408555984497e-01 - 9.9998408555984497e-01 - 9.9997484683990479e-01 - 9.9998360872268677e-01 - 1. - 9.9996256828308105e-01 + 2.1576626598834991e-01 + 1.8987368047237396e-01 + 7.4136221408843994e-01 + 1.5850366652011871e-01 + 3.5032036900520325e-01 + 2.7547970414161682e-01 + + + 9.0252566337585449e-01 + 8.2488614320755005e-01 + 3.0998113155364990e+00 + 7.9985678195953369e-01 + 9.0117520093917847e-01 + 1.6128941774368286e+00 + + 3.1517971307039261e-02 + 2.6900326833128929e-02 + 3.2406181097030640e-01 + 2.5436310097575188e-02 + 3.1640913337469101e-02 + 1.0374939441680908e-01 - - 6.9732612371444702e-01 - 6.7259842157363892e-01 - 1.9825903177261353e+00 - 6.1309921741485596e-01 - 8.4373235702514648e-01 - 1.3117414712905884e+00 + 9.1059452295303345e-01 + 9.1059452295303345e-01 + 2.9145858287811279e+00 + 7.7305060625076294e-01 + 1.2280260324478149e+00 + 1.4077984094619751e+00 - 4.0404040366411209e-02 - 3.6747857928276062e-02 - 4.1193920373916626e-01 - 2.9997996985912323e-02 - 5.9644669294357300e-02 - 1.3260821998119354e-01 + 4.2327091097831726e-02 + 4.2327091097831726e-02 + 4.4048944115638733e-01 + 3.4803714603185654e-02 + 6.4381949603557587e-02 + 1.5468718111515045e-01 diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/cones/disp2.png b/opencv_extra/testdata/cv/stereomatching/datasets/cones/disp2.png index f35f6aa3..0ac43989 100644 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/cones/disp2.png and b/opencv_extra/testdata/cv/stereomatching/datasets/cones/disp2.png differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/cones/disp6.png b/opencv_extra/testdata/cv/stereomatching/datasets/cones/disp6.png index adbe4a02..27d38ea2 100644 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/cones/disp6.png and b/opencv_extra/testdata/cv/stereomatching/datasets/cones/disp6.png differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/cones/im2.png b/opencv_extra/testdata/cv/stereomatching/datasets/cones/im2.png index c08e64b0..5dcd66e8 100644 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/cones/im2.png and b/opencv_extra/testdata/cv/stereomatching/datasets/cones/im2.png differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/cones/im6.png b/opencv_extra/testdata/cv/stereomatching/datasets/cones/im6.png index 5525c325..792a5f98 100644 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/cones/im6.png and b/opencv_extra/testdata/cv/stereomatching/datasets/cones/im6.png differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/cones/occ_and_discont.png b/opencv_extra/testdata/cv/stereomatching/datasets/cones/occ_and_discont.png deleted file mode 100755 index 6491dbe8..00000000 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/cones/occ_and_discont.png and /dev/null differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/cones/occ_and_textl.png b/opencv_extra/testdata/cv/stereomatching/datasets/cones/occ_and_textl.png deleted file mode 100644 index 174da61c..00000000 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/cones/occ_and_textl.png and /dev/null differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/cones/occl.png b/opencv_extra/testdata/cv/stereomatching/datasets/cones/occl.png deleted file mode 100755 index 2b0277e2..00000000 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/cones/occl.png and /dev/null differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/datasets.xml b/opencv_extra/testdata/cv/stereomatching/datasets/datasets.xml index 9710d269..4f4c26e7 100644 --- a/opencv_extra/testdata/cv/stereomatching/datasets/datasets.xml +++ b/opencv_extra/testdata/cv/stereomatching/datasets/datasets.xml @@ -4,10 +4,11 @@ barn2 "8" "0" bull "8" "0" - cones "1" "0" + cones "4" "0" poster "8" "0" sawtooth "8" "0" - teddy "1" "0" + teddy "4" "0" + tsukuba "16" "0" venus "8" "0" diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/disp2.png b/opencv_extra/testdata/cv/stereomatching/datasets/teddy/disp2.png index d1afc1bc..7388e1e6 100644 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/disp2.png and b/opencv_extra/testdata/cv/stereomatching/datasets/teddy/disp2.png differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/disp6.png b/opencv_extra/testdata/cv/stereomatching/datasets/teddy/disp6.png index ccbbf004..f7c74616 100644 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/disp6.png and b/opencv_extra/testdata/cv/stereomatching/datasets/teddy/disp6.png differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/im2.png b/opencv_extra/testdata/cv/stereomatching/datasets/teddy/im2.png index c7d9442c..d8d58d08 100644 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/im2.png and b/opencv_extra/testdata/cv/stereomatching/datasets/teddy/im2.png differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/im6.png b/opencv_extra/testdata/cv/stereomatching/datasets/teddy/im6.png index 1957f1f7..604d5f5d 100644 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/im6.png and b/opencv_extra/testdata/cv/stereomatching/datasets/teddy/im6.png differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/occ_and_discont.png b/opencv_extra/testdata/cv/stereomatching/datasets/teddy/occ_and_discont.png deleted file mode 100755 index c17bb6ae..00000000 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/occ_and_discont.png and /dev/null differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/occ_and_textl.png b/opencv_extra/testdata/cv/stereomatching/datasets/teddy/occ_and_textl.png deleted file mode 100755 index e79fb497..00000000 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/occ_and_textl.png and /dev/null differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/occl.png b/opencv_extra/testdata/cv/stereomatching/datasets/teddy/occl.png deleted file mode 100755 index 9f6b6d97..00000000 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/teddy/occl.png and /dev/null differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/truedisp.row3.col3.png b/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/disp2.png similarity index 100% rename from opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/truedisp.row3.col3.png rename to opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/disp2.png diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col3.png b/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/im2.png similarity index 100% rename from opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col3.png rename to opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/im2.png diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col4.png b/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/im6.png similarity index 100% rename from opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col4.png rename to opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/im6.png diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col1.png b/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col1.png deleted file mode 100644 index 21fdcd1c..00000000 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col1.png and /dev/null differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col2.png b/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col2.png deleted file mode 100644 index 75646f11..00000000 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col2.png and /dev/null differ diff --git a/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col5.png b/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col5.png deleted file mode 100644 index 9d087feb..00000000 Binary files a/opencv_extra/testdata/cv/stereomatching/datasets/tsukuba/scene1.row3.col5.png and /dev/null differ