diff --git a/.travis.yml b/.travis.yml index 3546b885..4ec2ff11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,17 +5,17 @@ matrix: services: - docker env: - - CIBW_SKIP="*manylinux1_i686* cp34-*" + - CIBW_SKIP="*manylinux1_i686* cp34-* cp35-* cp2*" - CIBW_BEFORE_BUILD="pip install -r requirements.txt && python setup.py prepare --liboptv-dir liboptv-src" - PIP=pip - os: osx language: generic env: - - PIP=pip2 + - PIP=pip3 - CIBW_BEFORE_BUILD="cd py_bind && pip install -r requirements.txt && python setup.py prepare --liboptv-dir liboptv-src" - - CIBW_SKIP=cp34-* + - CIBW_SKIP="cp34-* cp35-* cp2*" script: - "$PIP install cibuildwheel==0.10.2" @@ -30,4 +30,4 @@ deploy: file: wheelhouse/* on: tags: true - branch: master \ No newline at end of file + branch: master diff --git a/appveyor.yml b/appveyor.yml index 9960d95a..ed5422f8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ environment: - CIBW_SKIP: "*manylinux1_i686* cp34-*" + CIBW_SKIP: "*manylinux1_i686* cp34-* cp27-*" CIBW_BEFORE_BUILD: "cd py_bind && pip install -r requirements.txt && python setup.py prepare" build_script: diff --git a/docs/todo.md b/docs/todo.md index 2e07abf2..dce10393 100644 --- a/docs/todo.md +++ b/docs/todo.md @@ -25,9 +25,6 @@ done gradually, ask on the mailing list and we'll come up with a good plan. 3. Show that liboptv can be done in C++ and used in C. -## C-Tcl/Tk -1. Break C from Tcl/Tk - ## Python 1. Try Cmake on top of autoconf/automake to have a unified build system diff --git a/liboptv/CMakeLists.txt b/liboptv/CMakeLists.txt index 2ad9312d..d51f7c3b 100644 --- a/liboptv/CMakeLists.txt +++ b/liboptv/CMakeLists.txt @@ -4,9 +4,9 @@ set (CMAKE_INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/") project(OpenPTV) -# enable_testing() +enable_testing() add_subdirectory(src) -# add_subdirectory(tests) +add_subdirectory(tests) INSTALL(DIRECTORY include/ DESTINATION include/optv/) diff --git a/liboptv/include/track.h b/liboptv/include/track.h index ac3a57ef..a0a88c3d 100644 --- a/liboptv/include/track.h +++ b/liboptv/include/track.h @@ -36,8 +36,8 @@ foundpix; int candsearch_in_pix(target next[], int num_targets, double x, double y, double dl, double dr, double du, double dd, int p[4], control_par *cpar); -int candsearch_in_pixrest(target next[], int num_targets, double x, double y, - double dl, double dr, double du, double dd, int p[4], control_par *cpar); +int candsearch_in_pix_rest(target next[], int num_targets, double x, double y, + double dl, double dr, double du, double dd, int p[], control_par *cpar); int sort_candidates_by_freq (foundpix item[16], int num_cams); void searchquader(vec3d point, double xr[4], double xl[4], double yd[4], \ double yu[4], track_par *tpar, control_par *cpar, Calibration **cal); diff --git a/liboptv/src/track.c b/liboptv/src/track.c index a720c918..c929c2ed 100644 --- a/liboptv/src/track.c +++ b/liboptv/src/track.c @@ -34,6 +34,9 @@ #include +#define _USE_MATH_DEFINES +#include + /* internal-use defines, not needed by the outside world. */ #define TR_UNUSED -1 @@ -260,7 +263,7 @@ int candsearch_in_pix (target next[], int num_targets, double cent_x, double cen j0 -= 12; if (j0 < 0) j0 = 0; /* due to trunc */ for (j = j0; j ymax ) break; /* finish search */ if (next[j].x > xmin && next[j].x < xmax \ && next[j].y > ymin && next[j].y < ymax) { @@ -302,6 +305,147 @@ int candsearch_in_pix (target next[], int num_targets, double cent_x, double cen return (counter); } +/* candsearch_in_pix searches of four (4) near candidates in target list + * + * Arguments: + * target next[] - array of targets (pointer, x,y, n, nx,ny, sumg, track ID), + * assumed to be y sorted. + * int num_targets - target array length. + * double cent_x, cent_y - image coordinates of the position of a particle [pixel] + * double dl, dr, du, dd - respectively the left, right, up, down distance to + * the search area borders from its center, [pixel] + * int p[] - indices in ``next`` of the candidates found. + * control_par *cpar array of parameters (cpar->imx,imy are needed) + * + * Returns: + * int, the number of candidates found, between 0 - 3 + */ + +int candsearch_in_pix (target next[], int num_targets, double cent_x, double cent_y, + double dl, double dr, double du, double dd, int p[4], control_par *cpar) { + + int j, j0, dj; + int counter = 0, p1, p2, p3, p4; + double d, dmin = 1e20, xmin, xmax, ymin, ymax; + + xmin = cent_x - dl; xmax = cent_x + dr; ymin = cent_y - du; ymax = cent_y + dd; + + if(xmin<0.0) xmin = 0.0; + if(xmax > cpar->imx) + xmax = cpar->imx; + if(ymin<0.0) ymin = 0.0; + if(ymax > cpar->imy) + ymax = cpar->imy; + + for (j = 0; j<4; j++) ( p[j] = PT_UNUSED ); + p1 = p2 = p3 = p4 = PT_UNUSED; + + if (cent_x >= 0.0 && cent_x <= cpar->imx ) { + if (cent_y >= 0.0 && cent_y <= cpar->imy ) { + + /* binarized search for start point of candidate search */ + for (j0 = num_targets/2, dj = num_targets/4; dj>1; dj /= 2) + { + if (next[j0].y < ymin) j0 += dj; + else j0 -= dj; + } + + j0 -= 12; if (j0 < 0) j0 = 0; /* due to trunc */ + for (j = j0; j ymax ) break; /* finish search */ + if (next[j].x > xmin && next[j].x < xmax \ + && next[j].y > ymin && next[j].y < ymax) { + d = sqrt ((cent_x-next[j].x)*(cent_x-next[j].x) + \ + (cent_y-next[j].y)*(cent_y-next[j].y)); + + if (d < dmin) { + dmin = d; + p1 = j; + } + } + } + } + + p[0] = p1; + p[1] = p2; + p[2] = p3; + p[3] = p4; + + if ( p[0] != PT_UNUSED ) counter++; + } /* if y is within the image boundaries */ + } /* if x is within the image boundaries */ + return (counter); + +/* candsearch_in_pix_rest searches for a nearest candidate in unmatched target list + * + * Arguments: + * target next[] - array of targets (pointer, x,y, n, nx,ny, sumg, track ID), + * assumed to be y sorted. + * int num_targets - target array length. + * double cent_x, cent_y - image coordinates of the position of a particle [pixel] + * double dl, dr, du, dd - respectively the left, right, up, down distance to + * the search area borders from its center, [pixel] + * int p[] - indices in ``next`` of the candidates found. + * control_par *cpar array of parameters (cpar->imx,imy are needed) + * + * Returns: + * int, the number of candidates found, between 0 - 1 + */ + +int candsearch_in_pix_rest (target next[], int num_targets, double cent_x, double cent_y, + double dl, double dr, double du, double dd, int p[], control_par *cpar) + { + + int j, j0, dj; + int counter = 0; + double d, dmin = 1e20, xmin, xmax, ymin, ymax; + // double d1, d2, d3, d4; + + xmin = cent_x - dl; xmax = cent_x + dr; ymin = cent_y - du; ymax = cent_y + dd; + + if(xmin<0.0) xmin = 0.0; + if(xmax > cpar->imx) + xmax = cpar->imx; + if(ymin<0.0) ymin = 0.0; + if(ymax > cpar->imy) + ymax = cpar->imy; + + p[0] = PT_UNUSED; + + if (cent_x >= 0.0 && cent_x <= cpar->imx ) { + if (cent_y >= 0.0 && cent_y <= cpar->imy ) { + + /* binarized search for start point of candidate search */ + for (j0 = num_targets/2, dj = num_targets/4; dj>1; dj /= 2) + { + if (next[j0].y < ymin) j0 += dj; + else j0 -= dj; + } + + j0 -= 12; if (j0 < 0) j0 = 0; /* due to trunc */ + for (j = j0; j ymax ) break; /* finish search */ + if (next[j].x > xmin && next[j].x < xmax \ + && next[j].y > ymin && next[j].y < ymax) { + d = sqrt ((cent_x-next[j].x)*(cent_x-next[j].x) + \ + (cent_y-next[j].y)*(cent_y-next[j].y)); + + if (d < dmin) { + dmin = d; + p[0] = j; + } + } + } + } + + if ( p[0] != PT_UNUSED ) counter++; + } /* if y is within the image boundaries */ + } /* if x is within the image boundaries */ + return (counter); +} + /* searchquader defines the search region, using tracking parameters * dvxmin, ... dvzmax (but within the image boundaries), per camera * Its primary objective is to provide a safe search region in each camera @@ -571,14 +715,24 @@ int assess_new_position(vec3d pos, vec2d targ_pos[], double right, left, down, up; /* search rectangle limits */ left = right = up = down = ADD_PART; + // Alex version + // for (cam = 0; cam < frm->num_cams; cam++) { + + // older version + for (cam = 0; cam < TR_MAX_CAMS; cam++) { + targ_pos[cam][0] = targ_pos[cam][1] = COORD_UNUSED; + } + for (cam = 0; cam < run->cpar->num_cams; cam++) { + // up to here point_to_pixel(pixel, pos, run->cal[cam], run->cpar); - targ_pos[cam][0] = targ_pos[cam][1] = COORD_UNUSED; /* here we shall use only the 1st neigbhour */ - num_cands = candsearch_in_pix (frm->targets[cam], frm->num_targets[cam], + num_cands = candsearch_in_pix_rest (frm->targets[cam], frm->num_targets[cam], pixel[0], pixel[1], left, right, up, down, cand_inds[cam], run->cpar); + + // printf("num_cands after pix_rest is %d\n",num_cands); if (num_cands > 0) { _ix = cand_inds[cam][0]; // first nearest neighbour @@ -588,7 +742,7 @@ int assess_new_position(vec3d pos, vec2d targ_pos[], } valid_cams = 0; - for (cam = 0; cam < run->cpar->num_cams; cam++) { + for (cam = 0; cam < frm->num_cams; cam++) { if ((targ_pos[cam][0] != COORD_UNUSED) && \ (targ_pos[cam][1] != COORD_UNUSED)) { @@ -722,7 +876,7 @@ void trackcorr_c_loop (tracking_run *run_info, int step) { } else { vec_copy(X[2], X[1]); for (j = 0; j < fb->num_cams; j++) { - if (curr_corres->p[j] == -1) { + if (curr_corres->p[j] == CORRES_NONE) { point_to_pixel (v1[j], X[2], cal[j], cpar); } else { _ix = curr_corres->p[j]; @@ -1026,8 +1180,9 @@ double trackback_c (tracking_run *run_info) /* sequence loop */ for (step = seq_par->last - 1; step > seq_par->first; step--) { - printf ("Time step: %d, seqnr: %d:\n", - step - seq_par->first, step); + + // printf ("Time step: %d, seqnr: %d:\n", + // step - seq_par->first, step); for (h = 0; h < fb->buf[1]->num_parts; h++) { curr_path_inf = &(fb->buf[1]->path_info[h]); @@ -1173,7 +1328,7 @@ double trackback_c (tracking_run *run_info) if (curr_path_inf->prev != PREV_NONE ) count1++; } /* end of creation of links with decision check */ - printf ("step: %d, curr: %d, next: %d, links: %d, lost: %d, add: %d", + printf ("step: %d, curr: %d, next: %d, links: %d, lost: %d, add: %d \n", step, fb->buf[1]->num_parts, fb->buf[2]->num_parts, count1, fb->buf[1]->num_parts - count1, num_added); diff --git a/liboptv/tests/check_track.c b/liboptv/tests/check_track.c index 551bbb61..80ed86e8 100644 --- a/liboptv/tests/check_track.c +++ b/liboptv/tests/check_track.c @@ -16,6 +16,8 @@ #include #include "track.h" #include "calibration.h" +#include +#include #define EPS 1E-5 @@ -187,8 +189,6 @@ START_TEST(test_angle_acc) END_TEST - - START_TEST(test_candsearch_in_pix) { double cent_x, cent_y, dl, dr, du, dd; @@ -261,6 +261,67 @@ START_TEST(test_candsearch_in_pix) } END_TEST +START_TEST(test_candsearch_in_pix_rest) +{ + double cent_x, cent_y, dl, dr, du, dd; + int p[4], counter = 0; + + target test_pix[] = { + {0, 0.0, -0.2, 5, 1, 2, 10, 0}, + {6, 100.0, 100.0, 10, 8, 1, 20, -1}, + {3, 102.0, 102.0, 10, 3, 3, 30, -1}, + {4, 103.0, 103.0, 10, 3, 3, 40, 2}, + {1, -0.7, 1.2, 10, 3, 3, 50, 5}, /* should fall on imx,imy */ + {7, 1.2, 1.3, 10, 3, 3, 60, 7}, + {5, 1200, 201.1, 10, 3, 3, 70, 11} + }; + int num_targets = 7; + + + /* prepare test control parameters, basically for pix_x */ + int cam, i; + char img_format[] = "cam%d"; + char cal_format[] = "cal/cam%d.tif"; + control_par *test_cpar; + + test_cpar = new_control_par(4); + for (cam = 0; cam < 4; cam++) { + sprintf(test_cpar->img_base_name[cam], img_format, cam + 1); + sprintf(test_cpar->cal_img_base_name[cam], cal_format, cam + 1); + } + test_cpar->hp_flag = 1; + test_cpar->allCam_flag = 0; + test_cpar->tiff_flag = 1; + test_cpar->imx = 1280; + test_cpar->imy = 1024; + test_cpar->pix_x = 0.02; /* 20 micron pixel */ + test_cpar->pix_y = 0.02; + test_cpar->chfield = 0; + test_cpar->mm->n1 = 1; + test_cpar->mm->n2[0] = 1.49; + test_cpar->mm->n3 = 1.33; + test_cpar->mm->d[0] = 5; + + cent_x = cent_y = 98.9; + dl = dr = du = dd = 3; + + counter = candsearch_in_pix_rest (test_pix, num_targets, cent_x, cent_y, \ + dl, dr, du, dd, p, test_cpar); + + printf("in candsearch_in_pix_rest\n"); + printf("counter %d \n",counter); + printf("candidates: \n"); + for (i=0;inpart / range; nlinks = (double)run->nlinks / range; - ck_assert_msg(fabs(npart - 206.0/210.0)num_cams); run = tr_new_legacy("parameters/sequence.par", "parameters/track.par", "parameters/criteria.par", "parameters/ptv.par", calib); + + run->seq_par->first = 10240; + run->seq_par->last = 10250; + run->tpar->add = 1; + + track_forward_start(run); trackcorr_c_loop(run, run->seq_par->first); @@ -484,9 +551,9 @@ START_TEST(test_trackcorr_with_add) npart = (double)run->npart / range; nlinks = (double)run->nlinks / range; - ck_assert_msg(fabs(npart - 1928.0/210.0)num_cams); - printf("In test_cavity num cams = %d\n",cpar->num_cams); - ret = tr_new_legacy("parameters/sequence.par", + + run = tr_new_legacy("parameters/sequence.par", + "parameters/track.par", "parameters/criteria.par", + "parameters/ptv.par", calib); + + printf("num cams in run is %d\n",run->cpar->num_cams); + printf("add particle is %d\n",run->tpar->add); + + track_forward_start(run); + for (step = run->seq_par->first; step < run->seq_par->last; step++) { + trackcorr_c_loop(run, step); + } + trackcorr_c_finish(run, run->seq_par->last); + printf("total num parts is %d, num links is %d \n", run->npart, run->nlinks); + + ck_assert_msg(run->npart == 672+699+711, + "Was expecting npart == 2082 but found %d \n", run->npart); + ck_assert_msg(run->nlinks == 132+176+144, + "Was expecting nlinks == 452 found %ld \n", run->nlinks); + + + + run = tr_new_legacy("parameters/sequence.par", "parameters/track.par", "parameters/criteria.par", "parameters/ptv.par", calib); - track_forward_start(ret); + + run->tpar->add = 1; + printf("changed add particle to %d\n",run->tpar->add); + + track_forward_start(run); + for (step = run->seq_par->first; step < run->seq_par->last; step++) { + trackcorr_c_loop(run, step); + } + trackcorr_c_finish(run, run->seq_par->last); + printf("total num parts is %d, num links is %d \n", run->npart, run->nlinks); + + ck_assert_msg(run->npart == 672+699+715, + "Was expecting npart == 2086 but found %d \n", run->npart); + ck_assert_msg(run->nlinks == 132+180+149, + "Was expecting nlinks == 461 found %ld \n", run->nlinks); - trackcorr_c_loop (ret, 10002); empty_res_dir(); +} +END_TEST + +START_TEST(test_burgers) +{ + tracking_run *run; + Calibration *calib[4]; + control_par *cpar; + int status, step; + struct stat st = {0}; + + + printf("----------------------------\n"); + printf("Test Burgers vortex case \n"); - ck_assert_msg(ret->npart == 672, - "Was expecting npart == 672 but found %d \n", ret->npart); - ck_assert_msg(ret->nlinks == 127, - "Was expecting nlinks == 127 but found %d \n", ret->nlinks); + + fail_unless((status = chdir("testing_fodder/burgers")) == 0); + + if (stat("res", &st) == -1) { + mkdir("res", 0700); + } + copy_res_dir("res_orig/", "res/"); - trackcorr_c_finish(ret, 10002); + if (stat("img", &st) == -1) { + mkdir("img", 0700); + } + copy_res_dir("img_orig/", "img/"); + + fail_if((cpar = read_control_par("parameters/ptv.par"))== 0); + read_all_calibration(calib, cpar->num_cams); + + run = tr_new_legacy("parameters/sequence.par", + "parameters/track.par", "parameters/criteria.par", + "parameters/ptv.par", calib); + + printf("num cams in run is %d\n",run->cpar->num_cams); + printf("add particle is %d\n",run->tpar->add); + + track_forward_start(run); + for (step = run->seq_par->first; step < run->seq_par->last; step++) { + trackcorr_c_loop(run, step); + } + trackcorr_c_finish(run, run->seq_par->last); + printf("total num parts is %d, num links is %d \n", run->npart, run->nlinks); + + ck_assert_msg(run->npart == 19, + "Was expecting npart == 19 but found %d \n", run->npart); + ck_assert_msg(run->nlinks == 17, + "Was expecting nlinks == 17 found %ld \n", run->nlinks); + + + + run = tr_new_legacy("parameters/sequence.par", + "parameters/track.par", "parameters/criteria.par", + "parameters/ptv.par", calib); + + run->tpar->add = 1; + printf("changed add particle to %d\n",run->tpar->add); + + track_forward_start(run); + for (step = run->seq_par->first; step < run->seq_par->last; step++) { + trackcorr_c_loop(run, step); + } + trackcorr_c_finish(run, run->seq_par->last); + printf("total num parts is %d, num links is %d \n", run->npart, run->nlinks); + + ck_assert_msg(run->npart == 20, + "Was expecting npart == 20 but found %d \n", run->npart); + ck_assert_msg(run->nlinks ==20, + "Was expecting nlinks == 20 but found %d \n", run->nlinks); + + empty_res_dir(); + } END_TEST @@ -546,6 +722,11 @@ START_TEST(test_trackback) run = tr_new_legacy("parameters/sequence.par", "parameters/track.par", "parameters/criteria.par", "parameters/ptv.par", calib); + + run->seq_par->first = 10240; + run->seq_par->last = 10250; + run->tpar->add = 1; + track_forward_start(run); trackcorr_c_loop(run, run->seq_par->first); @@ -562,8 +743,8 @@ START_TEST(test_trackback) nlinks = trackback_c(run); empty_res_dir(); - ck_assert_msg(fabs(nlinks - 1.043062)add = 0; track_forward_start(run); - trackcorr_c_loop(run, 1); - trackcorr_c_loop(run, 2); + trackcorr_c_loop(run, 10001); + trackcorr_c_loop(run, 10002); + trackcorr_c_loop(run, 10003); + trackcorr_c_loop(run, 10004); fb_prev(run->fb); /* because each loop step moves the FB forward */ - fail_unless(run->fb->buf[1]->path_info[0].next == 1); + fail_unless(run->fb->buf[3]->path_info[0].next == -2); + printf("next is %d\n",run->fb->buf[3]->path_info[0].next ); - tpar->add = 0; + tpar->add = 1; track_forward_start(run); - trackcorr_c_loop(run, 1); - trackcorr_c_loop(run, 2); + trackcorr_c_loop(run, 10001); + trackcorr_c_loop(run, 10002); + trackcorr_c_loop(run, 10003); + trackcorr_c_loop(run, 10004); + fb_prev(run->fb); /* because each loop step moves the FB forward */ - + fail_unless(run->fb->buf[3]->path_info[0].next == 0); + printf("next is %d\n",run->fb->buf[3]->path_info[0].next ); empty_res_dir(); - - fail_unless(run->fb->buf[1]->path_info[0].next == 0); } END_TEST @@ -641,6 +829,11 @@ Suite* fb_suite(void) { tcase_add_test(tc, test_angle_acc); suite_add_tcase (s, tc); + + tc = tcase_create ("candsearch_in_pix_rest"); + tcase_add_test(tc, test_candsearch_in_pix_rest); + suite_add_tcase (s, tc); + tc = tcase_create ("candsearch_in_pix"); tcase_add_test(tc, test_candsearch_in_pix); suite_add_tcase (s, tc); @@ -665,6 +858,10 @@ Suite* fb_suite(void) { tcase_add_test(tc, test_cavity); suite_add_tcase (s, tc); + tc = tcase_create ("Test Burgers case"); + tcase_add_test(tc, test_burgers); + suite_add_tcase (s, tc); + tc = tcase_create ("Tracking forward without additions"); tcase_add_test(tc, test_trackcorr_no_add); suite_add_tcase (s, tc); diff --git a/liboptv/tests/testing_fodder/burgers/addpar.raw b/liboptv/tests/testing_fodder/burgers/addpar.raw new file mode 100755 index 00000000..aab3cf2e --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/addpar.raw @@ -0,0 +1 @@ +0 0 0 0 0 1 0 diff --git a/liboptv/tests/testing_fodder/burgers/cal/cam1.tif b/liboptv/tests/testing_fodder/burgers/cal/cam1.tif new file mode 100755 index 00000000..c32b74dd Binary files /dev/null and b/liboptv/tests/testing_fodder/burgers/cal/cam1.tif differ diff --git a/liboptv/tests/testing_fodder/burgers/cal/cam1.tif.addpar b/liboptv/tests/testing_fodder/burgers/cal/cam1.tif.addpar new file mode 100755 index 00000000..e2012572 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/cal/cam1.tif.addpar @@ -0,0 +1 @@ +0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 1.00000000 0.00000000 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/burgers/cal/cam1.tif.ori b/liboptv/tests/testing_fodder/burgers/cal/cam1.tif.ori new file mode 100755 index 00000000..a44f4ce6 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/cal/cam1.tif.ori @@ -0,0 +1,11 @@ +-50.97682484 51.05907553 204.08913317 + -0.24511426 -0.23776868 -0.05888177 + + 0.9701817 0.0571921 -0.2355347 + -0.0000313 0.9717919 0.2358400 + 0.2423789 -0.2288002 0.9428165 + + 0.0000 0.0000 + 80.0000 + + 0.000100000000000 0.000100000000000 0.000100000000000 diff --git a/liboptv/tests/testing_fodder/burgers/cal/cam2.tif b/liboptv/tests/testing_fodder/burgers/cal/cam2.tif new file mode 100755 index 00000000..e60fd447 Binary files /dev/null and b/liboptv/tests/testing_fodder/burgers/cal/cam2.tif differ diff --git a/liboptv/tests/testing_fodder/burgers/cal/cam2.tif.addpar b/liboptv/tests/testing_fodder/burgers/cal/cam2.tif.addpar new file mode 100755 index 00000000..e2012572 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/cal/cam2.tif.addpar @@ -0,0 +1 @@ +0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 1.00000000 0.00000000 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/burgers/cal/cam2.tif.ori b/liboptv/tests/testing_fodder/burgers/cal/cam2.tif.ori new file mode 100755 index 00000000..c26095bd --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/cal/cam2.tif.ori @@ -0,0 +1,11 @@ +50.97160633 51.05627373 204.08868177 + -0.24509662 0.23766561 0.05887799 + + 0.9702061 -0.0571899 0.2354345 + 0.0000562 0.9717945 0.2358292 + -0.2422810 -0.2287897 0.9428442 + + 0.0000 0.0000 + 80.0000 + + 0.000100000000000 0.000100000000000 0.000100000000000 diff --git a/liboptv/tests/testing_fodder/burgers/cal/cam3.tif b/liboptv/tests/testing_fodder/burgers/cal/cam3.tif new file mode 100755 index 00000000..c669bb20 Binary files /dev/null and b/liboptv/tests/testing_fodder/burgers/cal/cam3.tif differ diff --git a/liboptv/tests/testing_fodder/burgers/cal/cam3.tif.addpar b/liboptv/tests/testing_fodder/burgers/cal/cam3.tif.addpar new file mode 100755 index 00000000..e2012572 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/cal/cam3.tif.addpar @@ -0,0 +1 @@ +0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 1.00000000 0.00000000 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/burgers/cal/cam3.tif.ori b/liboptv/tests/testing_fodder/burgers/cal/cam3.tif.ori new file mode 100755 index 00000000..c7a2ffb9 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/cal/cam3.tif.ori @@ -0,0 +1,11 @@ +-50.97331065 -51.06080041 204.09230787 + 0.24520168 -0.23774465 0.05891347 + + 0.9701855 -0.0572232 -0.2355113 + 0.0000466 0.9717716 -0.2359238 + 0.2423635 0.2288788 0.9428014 + + 0.0000 0.0000 + 80.0000 + + 0.000100000000000 0.000100000000000 0.000100000000000 diff --git a/liboptv/tests/testing_fodder/burgers/cal/cam4.tif b/liboptv/tests/testing_fodder/burgers/cal/cam4.tif new file mode 100755 index 00000000..a6db8bb3 Binary files /dev/null and b/liboptv/tests/testing_fodder/burgers/cal/cam4.tif differ diff --git a/liboptv/tests/testing_fodder/burgers/cal/cam4.tif.addpar b/liboptv/tests/testing_fodder/burgers/cal/cam4.tif.addpar new file mode 100755 index 00000000..e2012572 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/cal/cam4.tif.addpar @@ -0,0 +1 @@ +0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 1.00000000 0.00000000 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/burgers/cal/cam4.tif.ori b/liboptv/tests/testing_fodder/burgers/cal/cam4.tif.ori new file mode 100755 index 00000000..83c9a92c --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/cal/cam4.tif.ori @@ -0,0 +1,11 @@ +50.96733824 -51.07163412 204.09103496 + 0.24524901 0.23763496 -0.05891113 + + 0.9702114 0.0572225 0.2354047 + -0.0000587 0.9717592 -0.2359746 + -0.2422597 0.2289315 0.9428152 + + 0.0000 0.0000 + 80.0000 + + 0.000100000000000 0.000100000000000 0.000100000000000 diff --git a/liboptv/tests/testing_fodder/burgers/cal/target_file.txt b/liboptv/tests/testing_fodder/burgers/cal/target_file.txt new file mode 100755 index 00000000..30e0de5d --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/cal/target_file.txt @@ -0,0 +1,25 @@ +1 -6.4 6.4 3.2 +2 -3.2 6.4 1.6 +3 0 6.4 0 +4 3.2 6.4 1.6 +5 6.4 6.4 3.2 +6 -6.4 3.2 3.2 +7 -3.2 3.2 1.6 +8 0 3.2 0 +9 3.2 3.2 1.6 +10 6.4 3.2 3.2 +11 -6.4 0 3.2 +12 -3.2 0 1.6 +13 0 0 0 +14 3.2 0 1.6 +15 6.4 0 3.2 +16 -6.4 -3.2 3.2 +17 -3.2 -3.2 1.6 +18 0 -3.2 0 +19 3.2 -3.2 1.6 +20 6.4 -3.2 3.2 +21 -6.4 -6.4 3.2 +22 -3.2 -6.4 1.6 +23 0 -6.4 0 +24 3.2 -6.4 1.6 +25 6.4 -6.4 3.2 diff --git a/liboptv/tests/testing_fodder/burgers/conf.yaml b/liboptv/tests/testing_fodder/burgers/conf.yaml new file mode 100755 index 00000000..4f76b2fc --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/conf.yaml @@ -0,0 +1,50 @@ +# Values taken from the parameters used in the C test for adding a particle. + +cameras: + - ori_file: testing_fodder/burgers/cal/cam1.tif.ori + addpar_file: testing_fodder/burgers/cal/cam1.tif.addpar + + - ori_file: testing_fodder/burgers/cal/cam2.tif.ori + addpar_file: testing_fodder/burgers/cal/cam2.tif.addpar + + - ori_file: testing_fodder/burgers/cal/cam3.tif.ori + addpar_file: testing_fodder/burgers/cal/cam3.tif.addpar + + - ori_file: testing_fodder/burgers/cal/cam4.tif.ori + addpar_file: testing_fodder/burgers/cal/cam4.tif.addpar + +scene: + flags: hp, headers + image_size: [ 1024, 1024 ] + pixel_size: [ 0.0065, 0.0065 ] + + # Multimedia parameters: + cam_side_n: 1 + object_side_n: 1 + wall_ns: [ 1 ] + wall_thicks: [ 1.0 ] + +correspondences: + x_span: [-40., 40.] + z_spans: + - [-10., 10.] + - [-10., 10.] + + pixels_x: 0.02 + pixels_y: 0.02 + pixels_tot: 0.02 + + ref_gray: 0.02 + min_correlation: 33 + epipolar_band: 0.01 # mm on sensor plane. + +sequence: + targets_template: testing_fodder/burgers/img/Cam{cam:1d}/frame_ + first: 10001 + last: 10006 + +tracking: + velocity_lims: [[-0.1, 0.1], [-0.1, 0.1], [-0.1, 0.1]] + angle_lim: 100 + accel_lim: 0.01 + add_particle: 0 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10001_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10001_targets new file mode 100755 index 00000000..b3a44092 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10001_targets @@ -0,0 +1,6 @@ +5 + 0 682.6395 209.0708 11 3 4 913 1 + 1 717.7905 290.5056 9 3 3 718 0 + 2 798.8343 363.6931 8 3 3 667 2 + 3 686.2139 413.0904 9 3 4 692 4 + 4 723.3933 445.4747 9 3 3 716 3 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10002_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10002_targets new file mode 100755 index 00000000..5a34aa55 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10002_targets @@ -0,0 +1,6 @@ +5 + 0 678.6480 207.1554 11 4 4 913 2 + 1 714.0000 288.0268 11 4 4 776 0 + 2 796.3027 360.0280 9 3 4 735 1 + 3 683.5204 409.7245 9 3 3 703 3 + 4 721.9586 441.2983 9 4 3 722 4 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10003_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10003_targets new file mode 100755 index 00000000..9da51ad9 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10003_targets @@ -0,0 +1,6 @@ +5 + 0 674.5351 205.1557 11 4 4 896 0 + 1 710.1342 285.5885 8 3 3 659 1 + 2 793.5925 356.3209 9 3 3 695 -1 + 3 680.8589 406.4123 8 4 3 685 2 + 4 720.5765 436.9646 9 3 4 713 3 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10004_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10004_targets new file mode 100755 index 00000000..9f5adec2 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10004_targets @@ -0,0 +1,6 @@ +5 + 0 670.4116 203.2069 9 3 3 824 4 + 1 706.2595 283.3449 8 3 3 636 3 + 2 790.6713 352.8039 9 4 3 722 1 + 3 678.0994 403.2062 8 3 4 657 2 + 4 719.0487 432.8231 9 4 4 719 0 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10005_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10005_targets new file mode 100755 index 00000000..7f55e937 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam1.10005_targets @@ -0,0 +1,6 @@ +5 + 0 666.2289 201.3933 10 4 3 850 0 + 1 702.4419 281.1279 8 3 4 664 4 + 2 787.8819 349.2930 9 3 3 703 1 + 3 675.2969 400.0964 10 4 4 789 2 + 4 717.4888 428.7353 8 3 3 677 3 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10001_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10001_targets new file mode 100755 index 00000000..d5852acd --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10001_targets @@ -0,0 +1,6 @@ +5 + 0 672.1364 226.5973 11 4 4 913 1 + 1 651.7522 309.4883 8 3 3 661 0 + 2 719.8757 391.5578 9 4 3 706 2 + 3 640.5206 430.3737 9 3 3 748 4 + 4 708.5805 469.1351 8 3 4 668 3 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10002_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10002_targets new file mode 100755 index 00000000..56ad58d0 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10002_targets @@ -0,0 +1,6 @@ +5 + 0 667.9233 224.2927 12 4 4 943 2 + 1 647.9502 306.5772 8 4 3 631 0 + 2 717.2707 387.4890 8 3 3 682 1 + 3 637.7520 426.7033 8 3 3 689 3 + 4 707.2652 464.6823 8 3 3 682 4 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10003_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10003_targets new file mode 100755 index 00000000..44968645 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10003_targets @@ -0,0 +1,6 @@ +5 + 0 663.7162 221.7950 11 4 4 884 0 + 1 643.9618 303.6804 9 4 3 687 1 + 2 714.5111 383.5443 9 3 3 721 -1 + 3 635.0750 423.0361 11 4 4 800 2 + 4 705.7514 460.3314 8 3 3 670 3 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10004_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10004_targets new file mode 100755 index 00000000..5a28b2f1 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10004_targets @@ -0,0 +1,6 @@ +5 + 0 659.6828 219.5063 13 4 4 996 4 + 1 640.0653 300.8769 9 4 4 689 3 + 2 711.6368 379.5974 9 3 3 740 1 + 3 632.1715 419.5581 8 4 3 664 2 + 4 704.1949 455.8656 8 4 3 651 0 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10005_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10005_targets new file mode 100755 index 00000000..30dc5061 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam2.10005_targets @@ -0,0 +1,6 @@ +5 + 0 655.4760 217.1353 11 3 4 939 0 + 1 636.0625 298.2094 9 3 4 680 4 + 2 708.6780 375.7404 9 3 4 697 1 + 3 629.2493 415.9714 9 3 4 727 2 + 4 702.5222 451.5389 9 3 3 720 3 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10001_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10001_targets new file mode 100755 index 00000000..5cc56558 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10001_targets @@ -0,0 +1,6 @@ +5 + 0 680.5740 221.0666 11 3 4 913 1 + 1 715.8280 250.3328 8 3 3 631 0 + 2 796.9490 317.6943 7 3 3 594 2 + 3 685.3590 387.5691 9 3 3 736 4 + 4 722.8054 454.1617 8 3 3 654 3 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10002_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10002_targets new file mode 100755 index 00000000..004ca618 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10002_targets @@ -0,0 +1,6 @@ +5 + 0 676.5571 218.6692 11 4 4 895 2 + 1 712.0689 247.4062 9 4 3 701 0 + 2 794.3276 313.8046 8 3 3 668 1 + 3 682.7578 384.0382 10 4 4 753 3 + 4 721.4788 449.7037 9 3 3 738 4 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10003_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10003_targets new file mode 100755 index 00000000..557e52e5 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10003_targets @@ -0,0 +1,6 @@ +5 + 0 672.5151 216.2866 11 4 4 904 0 + 1 708.2282 244.5647 8 3 3 629 1 + 2 791.4198 309.8410 10 3 4 749 -1 + 3 680.0387 380.4691 9 4 3 748 2 + 4 719.9485 445.4081 9 4 3 719 3 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10004_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10004_targets new file mode 100755 index 00000000..3493b2a4 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10004_targets @@ -0,0 +1,6 @@ +5 + 0 668.3939 213.8701 10 3 4 862 4 + 1 704.3237 241.7340 8 3 3 649 3 + 2 788.7273 305.9830 8 3 4 672 1 + 3 677.2479 376.7885 8 3 3 677 2 + 4 718.5055 441.1381 9 3 4 722 0 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10005_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10005_targets new file mode 100755 index 00000000..3552ddd4 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam3.10005_targets @@ -0,0 +1,6 @@ +5 + 0 664.3727 211.6458 11 4 3 927 0 + 1 700.4377 239.1760 9 3 4 681 4 + 2 785.8138 302.1364 11 4 4 781 1 + 3 674.3384 373.3830 9 3 3 719 2 + 4 716.7587 436.8040 9 3 4 735 3 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10001_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10001_targets new file mode 100755 index 00000000..99589601 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10001_targets @@ -0,0 +1,6 @@ +5 + 0 670.1549 199.7945 12 4 4 935 1 + 1 650.3690 228.2024 8 3 3 656 0 + 2 718.5000 286.6521 9 3 3 715 2 + 3 639.8913 368.9076 10 4 4 768 4 + 4 708.1207 429.5517 9 4 3 708 3 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10002_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10002_targets new file mode 100755 index 00000000..9d2420db --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10002_targets @@ -0,0 +1,6 @@ +5 + 0 665.9357 197.8007 12 4 4 939 2 + 1 646.5570 225.6254 9 3 3 711 0 + 2 715.6959 282.9620 9 4 4 702 1 + 3 637.1497 365.5339 8 3 3 674 3 + 4 706.6294 425.3020 8 3 3 714 4 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10003_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10003_targets new file mode 100755 index 00000000..ca85fc60 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10003_targets @@ -0,0 +1,6 @@ +5 + 0 661.9150 195.9901 12 4 4 933 0 + 1 642.7049 223.3544 8 3 3 691 1 + 2 712.9576 279.3788 8 4 3 650 -1 + 3 634.3665 362.3523 8 3 3 672 2 + 4 705.2455 421.1121 10 3 4 730 3 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10004_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10004_targets new file mode 100755 index 00000000..cce0ac6c --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10004_targets @@ -0,0 +1,6 @@ +5 + 0 657.7206 194.1597 13 4 4 996 4 + 1 638.7906 221.1438 8 3 3 640 3 + 2 710.0886 275.8576 10 4 3 716 1 + 3 631.5367 359.0480 9 3 4 714 2 + 4 703.5784 416.9342 9 3 4 717 0 diff --git a/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10005_targets b/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10005_targets new file mode 100755 index 00000000..ec02a178 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/img_orig/cam4.10005_targets @@ -0,0 +1,6 @@ +5 + 0 653.6208 192.5416 11 4 4 945 0 + 1 634.8417 218.8386 9 4 3 679 4 + 2 707.2302 272.3665 9 3 3 727 1 + 3 628.6469 356.0028 8 3 4 674 2 + 4 702.0331 412.8072 9 4 4 692 3 diff --git a/liboptv/tests/testing_fodder/burgers/man_ori.dat b/liboptv/tests/testing_fodder/burgers/man_ori.dat new file mode 100755 index 00000000..5f99f904 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/man_ori.dat @@ -0,0 +1,16 @@ +204.000000 206.000000 +825.000000 201.000000 +204.000000 825.000000 +829.000000 822.000000 +202.000000 199.000000 +819.000000 208.000000 +199.000000 823.000000 +823.000000 824.000000 +198.000000 194.000000 +832.000000 203.000000 +206.000000 816.000000 +824.000000 827.000000 +197.000000 202.000000 +824.000000 201.000000 +203.000000 825.000000 +820.000000 819.000000 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/cal_ori.par b/liboptv/tests/testing_fodder/burgers/parameters/cal_ori.par new file mode 100644 index 00000000..216ad807 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/cal_ori.par @@ -0,0 +1,12 @@ +cal/target_file.txt +cal/cam1.tif +cal/cam1.tif.ori +cal/cam2.tif +cal/cam2.tif.ori +cal/cam3.tif +cal/cam3.tif.ori +cal/cam4.tif +cal/cam4.tif.ori +1 +1 +0 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/criteria.par b/liboptv/tests/testing_fodder/burgers/parameters/criteria.par new file mode 100644 index 00000000..74445bcc --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/criteria.par @@ -0,0 +1,12 @@ +-40 +-10 +10 +40 +-10 +10 +0.02 +0.02 +0.02 +0.02 +33 +0.01 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/detect_plate.par b/liboptv/tests/testing_fodder/burgers/parameters/detect_plate.par new file mode 100644 index 00000000..b15c04fc --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/detect_plate.par @@ -0,0 +1,13 @@ +95 +65 +95 +85 +600 +3 +400 +3 +150 +3 +150 +200 +3 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/dumbbell.par b/liboptv/tests/testing_fodder/burgers/parameters/dumbbell.par new file mode 100644 index 00000000..185ea3d2 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/dumbbell.par @@ -0,0 +1,6 @@ +3.000000 +25.000000 +0.050000 +1.000000 +1 +500 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/examine.par b/liboptv/tests/testing_fodder/burgers/parameters/examine.par new file mode 100644 index 00000000..aeba736d --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/examine.par @@ -0,0 +1,2 @@ +0 +0 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/man_ori.dat b/liboptv/tests/testing_fodder/burgers/parameters/man_ori.dat new file mode 100644 index 00000000..5f99f904 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/man_ori.dat @@ -0,0 +1,16 @@ +204.000000 206.000000 +825.000000 201.000000 +204.000000 825.000000 +829.000000 822.000000 +202.000000 199.000000 +819.000000 208.000000 +199.000000 823.000000 +823.000000 824.000000 +198.000000 194.000000 +832.000000 203.000000 +206.000000 816.000000 +824.000000 827.000000 +197.000000 202.000000 +824.000000 201.000000 +203.000000 825.000000 +820.000000 819.000000 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/man_ori.par b/liboptv/tests/testing_fodder/burgers/parameters/man_ori.par new file mode 100644 index 00000000..02c3f945 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/man_ori.par @@ -0,0 +1,16 @@ +1 +5 +21 +25 +1 +5 +21 +25 +1 +5 +21 +25 +1 +5 +21 +25 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/multi_planes.par b/liboptv/tests/testing_fodder/burgers/parameters/multi_planes.par new file mode 100644 index 00000000..87780cac --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/multi_planes.par @@ -0,0 +1,4 @@ +3 +img/calib_a_cam +img/calib_b_cam +img/calib_c_cam \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/burgers/parameters/orient.par b/liboptv/tests/testing_fodder/burgers/parameters/orient.par new file mode 100644 index 00000000..d4170535 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/orient.par @@ -0,0 +1,12 @@ +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/pft_version b/liboptv/tests/testing_fodder/burgers/parameters/pft_version new file mode 100644 index 00000000..00750edc --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/pft_version @@ -0,0 +1 @@ +3 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/pft_version.par b/liboptv/tests/testing_fodder/burgers/parameters/pft_version.par new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/pft_version.par @@ -0,0 +1 @@ +0 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/ptv.par b/liboptv/tests/testing_fodder/burgers/parameters/ptv.par new file mode 100644 index 00000000..4908b4a2 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/ptv.par @@ -0,0 +1,21 @@ +4 +img/cam1.10001 +cal/cam1.tif +img/cam2.10001 +cal/cam2.tif +img/cam3.10001 +cal/cam3.tif +img/cam4.10001 +cal/cam4.tif +0 +0 +1 +1024 +1024 +0.0065 +0.0065 +0 +1 +1 +1 +1 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/sequence.par b/liboptv/tests/testing_fodder/burgers/parameters/sequence.par new file mode 100644 index 00000000..5dfd7599 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/sequence.par @@ -0,0 +1,6 @@ +img/cam1. +img/cam2. +img/cam3. +img/cam4. +10001 +10005 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/shaking.par b/liboptv/tests/testing_fodder/burgers/parameters/shaking.par new file mode 100644 index 00000000..9878214b --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/shaking.par @@ -0,0 +1,4 @@ +10000 +10004 +10 +5 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/sortgrid.par b/liboptv/tests/testing_fodder/burgers/parameters/sortgrid.par new file mode 100644 index 00000000..2edeafb0 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/sortgrid.par @@ -0,0 +1 @@ +20 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/burgers/parameters/targ_rec.par b/liboptv/tests/testing_fodder/burgers/parameters/targ_rec.par new file mode 100644 index 00000000..84933204 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/targ_rec.par @@ -0,0 +1,13 @@ +40 +40 +40 +40 +200 +1 +500 +1 +100 +1 +100 +150 +2 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/track.par b/liboptv/tests/testing_fodder/burgers/parameters/track.par new file mode 100644 index 00000000..1f28a200 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/track.par @@ -0,0 +1,9 @@ +-0.5 +0.5 +-0.5 +0.5 +-0.5 +0.5 +100 +0.1 +0 diff --git a/liboptv/tests/testing_fodder/burgers/parameters/unsharp_mask.par b/liboptv/tests/testing_fodder/burgers/parameters/unsharp_mask.par new file mode 100644 index 00000000..3cacc0b9 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/parameters/unsharp_mask.par @@ -0,0 +1 @@ +12 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10001 b/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10001 new file mode 100755 index 00000000..68f17c36 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10001 @@ -0,0 +1,6 @@ +5 + 1 3.095 4.352 2.401 1 1 1 1 + 2 2.983 5.391 0.419 0 0 0 0 + 3 4.425 3.087 2.906 2 2 2 2 + 4 3.693 1.136 0.596 4 4 4 4 + 5 2.727 2.022 1.677 3 3 3 3 diff --git a/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10002 b/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10002 new file mode 100755 index 00000000..670fe6ae --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10002 @@ -0,0 +1,6 @@ +5 + 1 3.027 4.401 2.403 1 1 1 1 + 2 4.378 3.155 2.907 2 2 2 2 + 3 2.909 5.429 0.424 0 0 0 0 + 4 2.679 2.085 1.678 3 3 3 3 + 5 3.668 1.214 0.597 4 4 4 4 diff --git a/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10003 b/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10003 new file mode 100755 index 00000000..b4436f3c --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10003 @@ -0,0 +1,5 @@ +4 + 1 2.835 5.469 0.422 0 0 0 0 + 2 2.957 4.448 2.402 1 1 1 1 + 3 2.630 2.147 1.677 3 3 3 3 + 4 3.642 1.292 0.595 4 4 4 4 diff --git a/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10004 b/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10004 new file mode 100755 index 00000000..ebf4adb8 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10004 @@ -0,0 +1,6 @@ +5 + 1 3.614 1.369 0.596 4 4 4 4 + 2 4.277 3.289 2.906 2 2 2 2 + 3 2.579 2.208 1.681 3 3 3 3 + 4 2.887 4.493 2.402 1 1 1 1 + 5 2.761 5.507 0.422 0 0 0 0 diff --git a/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10005 b/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10005 new file mode 100755 index 00000000..392f06cd --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/res_orig/rt_is.10005 @@ -0,0 +1,6 @@ +5 + 1 2.686 5.543 0.420 0 0 0 0 + 2 4.225 3.355 2.906 2 2 2 2 + 3 2.527 2.267 1.680 3 3 3 3 + 4 3.584 1.445 0.595 4 4 4 4 + 5 2.817 4.537 2.405 1 1 1 1 diff --git a/liboptv/tests/testing_fodder/burgers/tmp.addpar b/liboptv/tests/testing_fodder/burgers/tmp.addpar new file mode 100755 index 00000000..e2012572 --- /dev/null +++ b/liboptv/tests/testing_fodder/burgers/tmp.addpar @@ -0,0 +1 @@ +0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 1.00000000 0.00000000 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam1.10001_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam1.10001_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam1.10001_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam1.10001_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam1.10002_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam1.10002_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam1.10002_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam1.10002_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam1.10003_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam1.10003_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam1.10003_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam1.10003_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam1.10004_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam1.10004_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam1.10004_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam1.10004_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam2.10001_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam2.10001_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam2.10001_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam2.10001_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam2.10002_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam2.10002_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam2.10002_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam2.10002_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam2.10003_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam2.10003_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam2.10003_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam2.10003_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam2.10004_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam2.10004_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam2.10004_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam2.10004_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam3.10001_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam3.10001_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam3.10001_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam3.10001_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam3.10002_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam3.10002_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam3.10002_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam3.10002_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam3.10003_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam3.10003_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam3.10003_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam3.10003_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam3.10004_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam3.10004_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam3.10004_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam3.10004_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam4.10001_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam4.10001_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam4.10001_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam4.10001_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam4.10002_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam4.10002_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam4.10002_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam4.10002_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam4.10003_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam4.10003_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam4.10003_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam4.10003_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/img/cam4.10004_targets b/liboptv/tests/testing_fodder/test_cavity/img_orig/cam4.10004_targets similarity index 100% rename from liboptv/tests/testing_fodder/test_cavity/img/cam4.10004_targets rename to liboptv/tests/testing_fodder/test_cavity/img_orig/cam4.10004_targets diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/cal_ori.par b/liboptv/tests/testing_fodder/test_cavity/parameters/cal_ori.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/criteria.par b/liboptv/tests/testing_fodder/test_cavity/parameters/criteria.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/detect_plate.par b/liboptv/tests/testing_fodder/test_cavity/parameters/detect_plate.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/dumbbell.par b/liboptv/tests/testing_fodder/test_cavity/parameters/dumbbell.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/examine.par b/liboptv/tests/testing_fodder/test_cavity/parameters/examine.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/man_ori.par b/liboptv/tests/testing_fodder/test_cavity/parameters/man_ori.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/multi_planes.par b/liboptv/tests/testing_fodder/test_cavity/parameters/multi_planes.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/orient.par b/liboptv/tests/testing_fodder/test_cavity/parameters/orient.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/pft_version b/liboptv/tests/testing_fodder/test_cavity/parameters/pft_version old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/pft_version.par b/liboptv/tests/testing_fodder/test_cavity/parameters/pft_version.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/ptv.par b/liboptv/tests/testing_fodder/test_cavity/parameters/ptv.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/sequence.par b/liboptv/tests/testing_fodder/test_cavity/parameters/sequence.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/shaking.par b/liboptv/tests/testing_fodder/test_cavity/parameters/shaking.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/sortgrid.par b/liboptv/tests/testing_fodder/test_cavity/parameters/sortgrid.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/targ_rec.par b/liboptv/tests/testing_fodder/test_cavity/parameters/targ_rec.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/track.par b/liboptv/tests/testing_fodder/test_cavity/parameters/track.par old mode 100755 new mode 100644 index 2156c3ba..31706bac --- a/liboptv/tests/testing_fodder/test_cavity/parameters/track.par +++ b/liboptv/tests/testing_fodder/test_cavity/parameters/track.par @@ -1,9 +1,9 @@ --3.5 -3.5 --3.5 -3.5 --3.5 -3.5 -50 -0.8 -1 +-5.5 +5.5 +-5.5 +5.5 +-5.5 +5.5 +110 +1.0 +0 diff --git a/liboptv/tests/testing_fodder/test_cavity/parameters/unsharp_mask.par b/liboptv/tests/testing_fodder/test_cavity/parameters/unsharp_mask.par old mode 100755 new mode 100644 diff --git a/liboptv/tests/testing_fodder/track/newpart/cam1.0003_targets b/liboptv/tests/testing_fodder/track/newpart/cam1.0003_targets deleted file mode 100644 index 52854399..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam1.0003_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 967.881 590.869 100 10 10 10000 0 diff --git a/liboptv/tests/testing_fodder/track/newpart/cam1.0000_targets b/liboptv/tests/testing_fodder/track/newpart/cam1.10000_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam1.0000_targets rename to liboptv/tests/testing_fodder/track/newpart/cam1.10000_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam1.0001_targets b/liboptv/tests/testing_fodder/track/newpart/cam1.10001_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam1.0001_targets rename to liboptv/tests/testing_fodder/track/newpart/cam1.10001_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam1.0002_targets b/liboptv/tests/testing_fodder/track/newpart/cam1.10002_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam1.0002_targets rename to liboptv/tests/testing_fodder/track/newpart/cam1.10002_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam1.10003_targets b/liboptv/tests/testing_fodder/track/newpart/cam1.10003_targets new file mode 100644 index 00000000..40f58512 --- /dev/null +++ b/liboptv/tests/testing_fodder/track/newpart/cam1.10003_targets @@ -0,0 +1,2 @@ +1 + 0 967.881 590.869 100 10 10 10000 -1 diff --git a/liboptv/tests/testing_fodder/track/newpart/cam1.0004_targets b/liboptv/tests/testing_fodder/track/newpart/cam1.10004_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam1.0004_targets rename to liboptv/tests/testing_fodder/track/newpart/cam1.10004_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam1.0005_targets b/liboptv/tests/testing_fodder/track/newpart/cam1.10005_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam1.0005_targets rename to liboptv/tests/testing_fodder/track/newpart/cam1.10005_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam2.0003_targets b/liboptv/tests/testing_fodder/track/newpart/cam2.0003_targets deleted file mode 100644 index 7abd705c..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam2.0003_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 953.558 590.873 100 10 10 10000 0 diff --git a/liboptv/tests/testing_fodder/track/newpart/cam2.1 b/liboptv/tests/testing_fodder/track/newpart/cam2.1 deleted file mode 100644 index 71e9ed61..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam2.1 +++ /dev/null @@ -1 +0,0 @@ -1 0 9.528e+02 5.909e+02 100 10 1010000 0 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/track/newpart/cam2.0000_targets b/liboptv/tests/testing_fodder/track/newpart/cam2.10000_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam2.0000_targets rename to liboptv/tests/testing_fodder/track/newpart/cam2.10000_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam2.0001_targets b/liboptv/tests/testing_fodder/track/newpart/cam2.10001_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam2.0001_targets rename to liboptv/tests/testing_fodder/track/newpart/cam2.10001_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam2.0002_targets b/liboptv/tests/testing_fodder/track/newpart/cam2.10002_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam2.0002_targets rename to liboptv/tests/testing_fodder/track/newpart/cam2.10002_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam2.10003_targets b/liboptv/tests/testing_fodder/track/newpart/cam2.10003_targets new file mode 100644 index 00000000..f8575076 --- /dev/null +++ b/liboptv/tests/testing_fodder/track/newpart/cam2.10003_targets @@ -0,0 +1,2 @@ +1 + 0 953.558 590.873 100 10 10 10000 -1 diff --git a/liboptv/tests/testing_fodder/track/newpart/cam2.0004_targets b/liboptv/tests/testing_fodder/track/newpart/cam2.10004_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam2.0004_targets rename to liboptv/tests/testing_fodder/track/newpart/cam2.10004_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam2.0005_targets b/liboptv/tests/testing_fodder/track/newpart/cam2.10005_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam2.0005_targets rename to liboptv/tests/testing_fodder/track/newpart/cam2.10005_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam2.2 b/liboptv/tests/testing_fodder/track/newpart/cam2.2 deleted file mode 100644 index 6d34be57..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam2.2 +++ /dev/null @@ -1 +0,0 @@ -1 0 9.532e+02 5.909e+02 100 10 1010000 0 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/track/newpart/cam2.3 b/liboptv/tests/testing_fodder/track/newpart/cam2.3 deleted file mode 100644 index b019b4c5..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam2.3 +++ /dev/null @@ -1 +0,0 @@ -1 0 9.536e+02 5.909e+02 100 10 1010000 0 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/track/newpart/cam2.4 b/liboptv/tests/testing_fodder/track/newpart/cam2.4 deleted file mode 100644 index 47dd62bb..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam2.4 +++ /dev/null @@ -1 +0,0 @@ -1 0 9.539e+02 5.909e+02 100 10 1010000 0 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/track/newpart/cam2.5 b/liboptv/tests/testing_fodder/track/newpart/cam2.5 deleted file mode 100644 index 942cf224..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam2.5 +++ /dev/null @@ -1 +0,0 @@ -1 0 9.543e+02 5.909e+02 100 10 1010000 0 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/track/newpart/cam3.0003_targets b/liboptv/tests/testing_fodder/track/newpart/cam3.0003_targets deleted file mode 100644 index c02a7df1..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam3.0003_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 955.783 590.873 100 10 10 10000 0 diff --git a/liboptv/tests/testing_fodder/track/newpart/cam3.1 b/liboptv/tests/testing_fodder/track/newpart/cam3.1 deleted file mode 100644 index 0954c3a3..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam3.1 +++ /dev/null @@ -1 +0,0 @@ -1 0 2.362e+03 5.910e+02 100 10 1010000 0 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/track/newpart/cam3.0000_targets b/liboptv/tests/testing_fodder/track/newpart/cam3.10000_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam3.0000_targets rename to liboptv/tests/testing_fodder/track/newpart/cam3.10000_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam3.0001_targets b/liboptv/tests/testing_fodder/track/newpart/cam3.10001_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam3.0001_targets rename to liboptv/tests/testing_fodder/track/newpart/cam3.10001_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam3.0002_targets b/liboptv/tests/testing_fodder/track/newpart/cam3.10002_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam3.0002_targets rename to liboptv/tests/testing_fodder/track/newpart/cam3.10002_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam3.10003_targets b/liboptv/tests/testing_fodder/track/newpart/cam3.10003_targets new file mode 100644 index 00000000..ee1c12e6 --- /dev/null +++ b/liboptv/tests/testing_fodder/track/newpart/cam3.10003_targets @@ -0,0 +1,2 @@ +1 + 0 955.783 590.873 100 10 10 10000 -1 diff --git a/liboptv/tests/testing_fodder/track/newpart/cam3.0004_targets b/liboptv/tests/testing_fodder/track/newpart/cam3.10004_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam3.0004_targets rename to liboptv/tests/testing_fodder/track/newpart/cam3.10004_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam3.0005_targets b/liboptv/tests/testing_fodder/track/newpart/cam3.10005_targets similarity index 100% rename from liboptv/tests/testing_fodder/track/newpart/cam3.0005_targets rename to liboptv/tests/testing_fodder/track/newpart/cam3.10005_targets diff --git a/liboptv/tests/testing_fodder/track/newpart/cam3.2 b/liboptv/tests/testing_fodder/track/newpart/cam3.2 deleted file mode 100644 index 0954c3a3..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam3.2 +++ /dev/null @@ -1 +0,0 @@ -1 0 2.362e+03 5.910e+02 100 10 1010000 0 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/track/newpart/cam3.3 b/liboptv/tests/testing_fodder/track/newpart/cam3.3 deleted file mode 100644 index afd8e995..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam3.3 +++ /dev/null @@ -1 +0,0 @@ -1 0 2.361e+03 5.910e+02 100 10 1010000 0 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/track/newpart/cam3.4 b/liboptv/tests/testing_fodder/track/newpart/cam3.4 deleted file mode 100644 index afd8e995..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam3.4 +++ /dev/null @@ -1 +0,0 @@ -1 0 2.361e+03 5.910e+02 100 10 1010000 0 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/track/newpart/cam3.5 b/liboptv/tests/testing_fodder/track/newpart/cam3.5 deleted file mode 100644 index afd8e995..00000000 --- a/liboptv/tests/testing_fodder/track/newpart/cam3.5 +++ /dev/null @@ -1 +0,0 @@ -1 0 2.361e+03 5.910e+02 100 10 1010000 0 \ No newline at end of file diff --git a/liboptv/tests/testing_fodder/track/parameters/control_newpart.par b/liboptv/tests/testing_fodder/track/parameters/control_newpart.par index a254e1df..7632f4b5 100644 --- a/liboptv/tests/testing_fodder/track/parameters/control_newpart.par +++ b/liboptv/tests/testing_fodder/track/parameters/control_newpart.par @@ -1,10 +1,10 @@ 3 -img/cam1.10099 +img/cam1.10000 cal/cam1.tif -img/cam2.10099 -cal/cam2.tif -img/cam2.10018 +img/cam2.10000 cal/cam2.tif +img/cam3.10000 +cal/cam3.tif 1 0 1 diff --git a/liboptv/tests/testing_fodder/track/parameters/sequence.par b/liboptv/tests/testing_fodder/track/parameters/sequence.par index 55f10aea..ece37546 100644 --- a/liboptv/tests/testing_fodder/track/parameters/sequence.par +++ b/liboptv/tests/testing_fodder/track/parameters/sequence.par @@ -1,4 +1,4 @@ img/cam1. img/cam2. 10095 -10305 +10105 diff --git a/liboptv/tests/testing_fodder/track/parameters/sequence_newpart.par b/liboptv/tests/testing_fodder/track/parameters/sequence_newpart.par index 0ea95670..8bb8daec 100644 --- a/liboptv/tests/testing_fodder/track/parameters/sequence_newpart.par +++ b/liboptv/tests/testing_fodder/track/parameters/sequence_newpart.par @@ -1,5 +1,5 @@ newpart/cam1. newpart/cam2. newpart/cam3. -1 -5 +10001 +10005 diff --git a/liboptv/tests/testing_fodder/track/res_orig/particles.1 b/liboptv/tests/testing_fodder/track/res_orig/particles.10001 similarity index 100% rename from liboptv/tests/testing_fodder/track/res_orig/particles.1 rename to liboptv/tests/testing_fodder/track/res_orig/particles.10001 diff --git a/liboptv/tests/testing_fodder/track/res_orig/particles.2 b/liboptv/tests/testing_fodder/track/res_orig/particles.10002 similarity index 100% rename from liboptv/tests/testing_fodder/track/res_orig/particles.2 rename to liboptv/tests/testing_fodder/track/res_orig/particles.10002 diff --git a/liboptv/tests/testing_fodder/track/res_orig/particles.10003 b/liboptv/tests/testing_fodder/track/res_orig/particles.10003 new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/liboptv/tests/testing_fodder/track/res_orig/particles.10003 @@ -0,0 +1 @@ +0 diff --git a/liboptv/tests/testing_fodder/track/res_orig/particles.4 b/liboptv/tests/testing_fodder/track/res_orig/particles.10004 similarity index 100% rename from liboptv/tests/testing_fodder/track/res_orig/particles.4 rename to liboptv/tests/testing_fodder/track/res_orig/particles.10004 diff --git a/liboptv/tests/testing_fodder/track/res_orig/particles.5 b/liboptv/tests/testing_fodder/track/res_orig/particles.10005 similarity index 100% rename from liboptv/tests/testing_fodder/track/res_orig/particles.5 rename to liboptv/tests/testing_fodder/track/res_orig/particles.10005 diff --git a/liboptv/tests/testing_fodder/track/res_orig/particles.3 b/liboptv/tests/testing_fodder/track/res_orig/particles.3 deleted file mode 100644 index e546fc9b..00000000 --- a/liboptv/tests/testing_fodder/track/res_orig/particles.3 +++ /dev/null @@ -1,2 +0,0 @@ -1 - 1 0.020 0.000 0.000 0 0 0 0 diff --git a/py_bind/requirements.txt b/py_bind/requirements.txt index 1a025509..d8c0cda1 100644 --- a/py_bind/requirements.txt +++ b/py_bind/requirements.txt @@ -1,5 +1,5 @@ Cython==0.29.6 nose==1.3.7 numpy==1.16.2 -PyYAML==5.1 +PyYAML==5.4 six diff --git a/py_bind/setup.py b/py_bind/setup.py index 5884c6d9..5d3d10dd 100644 --- a/py_bind/setup.py +++ b/py_bind/setup.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import print_function + from distutils.core import setup import setuptools import os @@ -8,6 +8,7 @@ import glob from setuptools import Extension from setuptools.command.build_ext import build_ext +import importlib class PrepareCommand(setuptools.Command): @@ -83,11 +84,11 @@ def get_numpy_include_dir(): import numpy imp.reload(numpy) else: - import __builtin__ + import builtins if hasattr(__builtin__, '__NUMPY_SETUP__'): - del __builtin__.__NUMPY_SETUP__ + del builtins.__NUMPY_SETUP__ import numpy - reload(numpy) + importlib.reload(numpy) try: return numpy.get_include() @@ -156,7 +157,7 @@ def mk_ext(name, files): version='0.2.6', install_requires=[ 'numpy>=1.16.1', - 'pyyaml', + 'pyyaml>=5.4', ], setup_requires=['numpy>=1.16.1'], ) diff --git a/py_bind/test/test_burgers.py b/py_bind/test/test_burgers.py new file mode 100644 index 00000000..b0d45953 --- /dev/null +++ b/py_bind/test/test_burgers.py @@ -0,0 +1,115 @@ +# -*- coding: utf-8 -*- +""" +Tests for the Tracker with add_particles using Burgers vortex data +with ground truth + +Created on Mon Apr 24 10:57:01 2017 + +@author: alexlib +""" + +import unittest +import yaml +import os +import shutil +from optv.tracker import Tracker +from optv.calibration import Calibration +from optv.parameters import ControlParams, VolumeParams, TrackingParams, \ + SequenceParams + +framebuf_naming = { + 'corres': b'testing_fodder/burgers/res/rt_is', + 'linkage': b'testing_fodder/burgers/res/ptv_is', + 'prio': b'testing_fodder/burgers/res/whatever' +} + + +class TestTracker(unittest.TestCase): + def setUp(self): + with open(b"testing_fodder/burgers/conf.yaml") as f: + yaml_conf = yaml.load(f, Loader=yaml.FullLoader) + seq_cfg = yaml_conf['sequence'] + + cals = [] + img_base = [] + print(yaml_conf['cameras']) + for cix, cam_spec in enumerate(yaml_conf['cameras']): + cam_spec.setdefault(b'addpar_file', None) + cal = Calibration() + cal.from_file(cam_spec['ori_file'].encode(), + cam_spec['addpar_file'].encode()) + cals.append(cal) + img_base.append(seq_cfg['targets_template'].format(cam=cix + 1)) + + cpar = ControlParams(len(yaml_conf['cameras']), **yaml_conf['scene']) + vpar = VolumeParams(**yaml_conf['correspondences']) + tpar = TrackingParams(**yaml_conf['tracking']) + spar = SequenceParams( + image_base=img_base, + frame_range=(seq_cfg['first'], seq_cfg['last'])) + + self.tracker = Tracker(cpar, vpar, tpar, spar, cals, framebuf_naming) + + def test_forward(self): + """Manually running a full forward tracking run.""" + # path = 'testing_fodder/burgers/res' + # try: + # os.mkdir(path) + # except OSError: + # print("Creation of the directory %s failed" % path) + # else: + # print("Successfully created the directory %s " % path) + + shutil.copytree( + "testing_fodder/burgers/res_orig/", "testing_fodder/burgers/res/") + shutil.copytree( + "testing_fodder/burgers/img_orig/", "testing_fodder/burgers/img/") + + self.tracker.restart() + last_step = 10001 + while self.tracker.step_forward(): + self.failUnless(self.tracker.current_step() > last_step) + with open("testing_fodder/burgers/res/rt_is.%d" % last_step) as f: + lines = f.readlines() + # print(last_step,lines[0]) + # print(lines) + if last_step == 10003: + self.failUnless(lines[0] == "4\n") + else: + self.failUnless(lines[0] == "5\n") + last_step += 1 + self.tracker.finalize() + + def test_full_forward(self): + """Automatic full forward tracking run.""" + # os.mkdir('testing_fodder/burgers/res') + shutil.copytree( + "testing_fodder/burgers/res_orig/", "testing_fodder/burgers/res/") + shutil.copytree( + "testing_fodder/burgers/img_orig/", "testing_fodder/burgers/img/") + self.tracker.full_forward() + # if it passes without error, we assume it's ok. The actual test is in + # the C code. + + def test_full_backward(self): + """Automatic full backward correction phase.""" + shutil.copytree( + "testing_fodder/burgers/res_orig/", "testing_fodder/burgers/res/") + shutil.copytree( + "testing_fodder/burgers/img_orig/", "testing_fodder/burgers/img/") + self.tracker.full_forward() + self.tracker.full_backward() + # if it passes without error, we assume it's ok. The actual test is in + # the C code. + + def tearDown(self): + if os.path.exists("testing_fodder/burgers/res/"): + shutil.rmtree("testing_fodder/burgers/res/") + if os.path.exists("testing_fodder/burgers/img/"): + shutil.rmtree("testing_fodder/burgers/img/") + # print("there is a /res folder\n") + # pass + + +if __name__ == "__main__": + unittest.main() diff --git a/py_bind/test/test_corresp.py b/py_bind/test/test_corresp.py index dcc023dc..f55d9402 100644 --- a/py_bind/test/test_corresp.py +++ b/py_bind/test/test_corresp.py @@ -29,7 +29,7 @@ def test_instantiate(self): pos, pnr = mc.as_arrays() # x sorted? - self.failUnless(np.all(pos[1:,0] > pos[:-1,0])) + self.assertTrue(np.all(pos[1:,0] > pos[:-1,0])) # Manually verified order for the loaded data: np.testing.assert_array_equal( @@ -82,7 +82,7 @@ def test_full_corresp(self): _, _, num_targs = correspondences( img_pts, corrected, cals, vpar, cpar) - self.failUnlessEqual(num_targs, 16) + self.assertEqual(num_targs, 16) def test_single_cam_corresp(self): """Single camera correspondence""" @@ -127,11 +127,11 @@ def test_single_cam_corresp(self): _, _, num_targs = correspondences( img_pts, corrected, cals, vpar, cpar) - self.failUnlessEqual(num_targs, 9) + self.assertEqual(num_targs, 9) if __name__ == "__main__": import sys, os - print(os.path.abspath(os.curdir)) + print((os.path.abspath(os.curdir))) unittest.main() \ No newline at end of file diff --git a/py_bind/test/test_epipolar.py b/py_bind/test/test_epipolar.py index eab45503..e6ae3f2b 100644 --- a/py_bind/test/test_epipolar.py +++ b/py_bind/test/test_epipolar.py @@ -47,11 +47,11 @@ def test_two_cameras(self): # directly at each other. mid = np.r_[sens_size]/2. line = epipolar_curve(mid, orig_cal, proj_cal, 5, cpar, vpar) - self.failUnless(np.all(abs(line - mid) < 1e-6)) + self.assertTrue(np.all(abs(line - mid) < 1e-6)) # An equatorial point draws a latitude. line = epipolar_curve( mid - np.r_[100., 0.], orig_cal, proj_cal, 5, cpar, vpar) np.testing.assert_array_equal(np.argsort(line[:,0]), np.arange(5)[::-1]) - self.failUnless(np.all(abs(line[:,1] - mid[1]) < 1e-6)) + self.assertTrue(np.all(abs(line[:,1] - mid[1]) < 1e-6)) diff --git a/py_bind/test/test_framebuf.py b/py_bind/test/test_framebuf.py index 591afb22..5b94efb3 100644 --- a/py_bind/test/test_framebuf.py +++ b/py_bind/test/test_framebuf.py @@ -13,28 +13,28 @@ class TestTargets(unittest.TestCase): def test_fill_target(self): t = Target(pnr=1, tnr=2 ,x=1.5, y=2.5, n=20, nx=4, ny=5, sumg=30) - self.failUnlessEqual(t.pnr(), 1) - self.failUnlessEqual(t.tnr(), 2) - self.failUnlessEqual(t.pos(), (1.5, 2.5)) - self.failUnlessEqual(t.count_pixels(), (20, 4, 5)) - self.failUnlessEqual(t.sum_grey_value(), 30) + self.assertEqual(t.pnr(), 1) + self.assertEqual(t.tnr(), 2) + self.assertEqual(t.pos(), (1.5, 2.5)) + self.assertEqual(t.count_pixels(), (20, 4, 5)) + self.assertEqual(t.sum_grey_value(), 30) def test_fill_target_array(self): tarr = TargetArray(2) tarr[0].set_pos((1.5, 2.5)) tarr[1].set_pos((3.5, 4.5)) - self.failUnlessEqual(tarr[0].pos(), (1.5, 2.5)) - self.failUnlessEqual(tarr[1].pos(), (3.5, 4.5)) + self.assertEqual(tarr[0].pos(), (1.5, 2.5)) + self.assertEqual(tarr[1].pos(), (3.5, 4.5)) def test_read_targets(self): """Reading a targets file from Python.""" targs = read_targets("../../liboptv/tests/testing_fodder/sample_", 42) - self.failUnlessEqual(len(targs), 2) - self.failUnlessEqual([targ.tnr() for targ in targs], [1, 0]) - self.failUnlessEqual([targ.pos()[0] for targ in targs], [1127., 796.]) - self.failUnlessEqual([targ.pos()[1] for targ in targs], [796., 809.]) + self.assertEqual(len(targs), 2) + self.assertEqual([targ.tnr() for targ in targs], [1, 0]) + self.assertEqual([targ.pos()[0] for targ in targs], [1127., 796.]) + self.assertEqual([targ.pos()[1] for targ in targs], [796., 809.]) def test_sort_y(self): """sorting on the Y coordinate in place""" @@ -43,7 +43,7 @@ def test_sort_y(self): revs.sort_y() for targ, rev in zip(targs, revs): - self.failUnless(targ.pos(), rev.pos()) + self.assertTrue(targ.pos(), rev.pos()) def test_write_targets(self): """Round-trip test of writing targets.""" @@ -51,12 +51,12 @@ def test_write_targets(self): targs.write(b"testing_fodder/round_trip.", 1) tback = read_targets("testing_fodder/round_trip.", 1) - self.failUnlessEqual(len(targs), len(tback)) - self.failUnlessEqual([targ.tnr() for targ in targs], + self.assertEqual(len(targs), len(tback)) + self.assertEqual([targ.tnr() for targ in targs], [targ.tnr() for targ in tback]) - self.failUnlessEqual([targ.pos()[0] for targ in targs], + self.assertEqual([targ.pos()[0] for targ in targs], [targ.pos()[0] for targ in tback]) - self.failUnlessEqual([targ.pos()[1] for targ in targs], + self.assertEqual([targ.pos()[1] for targ in targs], [targ.pos()[1] for targ in tback]) def tearDown(self): @@ -73,10 +73,10 @@ def test_read_frame(self): target_file_base=targ_files, frame_num=333) pos = frm.positions() - self.failUnlessEqual(pos.shape, (10,3)) + self.assertEqual(pos.shape, (10,3)) targs = frm.target_positions_for_camera(3) - self.failUnlessEqual(targs.shape, (10,2)) + self.assertEqual(targs.shape, (10,2)) targs_correct = np.array([[ 426., 199.], [ 429., 60.], diff --git a/py_bind/test/test_orientation.py b/py_bind/test/test_orientation.py index 90ac951c..51a3719b 100644 --- a/py_bind/test/test_orientation.py +++ b/py_bind/test/test_orientation.py @@ -49,7 +49,7 @@ def test_match_detection_to_ref(self): (xy_img_pts_pixel[i][0], xy_img_pts_pixel[i][1])) # create randomized target array - indices = range(coords_count) + indices = list(range(coords_count)) shuffled_indices = list(range(coords_count)) while indices == shuffled_indices: diff --git a/py_bind/test/test_parameters_bindings.py b/py_bind/test/test_parameters_bindings.py index 9098adcd..6a5a38b0 100644 --- a/py_bind/test/test_parameters_bindings.py +++ b/py_bind/test/test_parameters_bindings.py @@ -13,15 +13,15 @@ def test_mm_np_instantiation(self): # Initialize MultimediaParams object (uses all setters of MultimediaParams) m = MultimediaParams(n1=2, n2=n2_np, d=d_np, n3=4) - self.failUnlessEqual(m.get_nlay(), 3) - self.failUnlessEqual(m.get_n1(), 2) - self.failUnlessEqual(m.get_n3(), 4) - self.failUnlessEqual(m.get_nlay(), len(d_np)) + self.assertEqual(m.get_nlay(), 3) + self.assertEqual(m.get_n1(), 2) + self.assertEqual(m.get_n3(), 4) + self.assertEqual(m.get_nlay(), len(d_np)) numpy.testing.assert_array_equal(m.get_d(), d_np) numpy.testing.assert_array_equal(m.get_n2(), n2_np) - self.failUnlessEqual(m.__str__(), "nlay=\t3 \nn1=\t2.0 \nn2=\t{11.0, 22.0, 33.0} \nd=\t{55.0, 66.0, 77.0} \nn3=\t4.0 ") + self.assertEqual(m.__str__(), "nlay=\t3 \nn1=\t2.0 \nn2=\t{11.0, 22.0, 33.0} \nd=\t{55.0, 66.0, 77.0} \nn3=\t4.0 ") # pass two arrays with different number of elements new_arr = numpy.array([1, 2, 3, 4]) @@ -50,15 +50,15 @@ def setUp(self): # Testing getters according to the values passed in setUp def test_TrackingParams_getters(self): - self.failUnless(self.track_obj1.get_dacc() == 1.1) - self.failUnless(self.track_obj1.get_dangle() == 2.2) - self.failUnless(self.track_obj1.get_dvxmin() == 3.3) - self.failUnless(self.track_obj1.get_dvxmax() == 4.4) - self.failUnless(self.track_obj1.get_dvymin() == 5.5) - self.failUnless(self.track_obj1.get_dvymax() == 6.6) - self.failUnless(self.track_obj1.get_dvzmin() == 7.7) - self.failUnless(self.track_obj1.get_dvzmax() == 8.8) - self.failUnless(self.track_obj1.get_add() == 1) + self.assertTrue(self.track_obj1.get_dacc() == 1.1) + self.assertTrue(self.track_obj1.get_dangle() == 2.2) + self.assertTrue(self.track_obj1.get_dvxmin() == 3.3) + self.assertTrue(self.track_obj1.get_dvxmax() == 4.4) + self.assertTrue(self.track_obj1.get_dvymin() == 5.5) + self.assertTrue(self.track_obj1.get_dvymax() == 6.6) + self.assertTrue(self.track_obj1.get_dvzmin() == 7.7) + self.assertTrue(self.track_obj1.get_dvzmax() == 8.8) + self.assertTrue(self.track_obj1.get_add() == 1) def test_TrackingParams_read_from_file(self): """Filling a TrackingParams object by reading file""" @@ -69,20 +69,20 @@ def test_TrackingParams_read_from_file(self): # check that the values of track_obj1 are equal to values in tracking parameters file # the check is performed according to the order the parameters were read from same file track_file = open(self.input_tracking_par_file_name, 'r') - self.failUnless(self.track_obj1.get_dvxmin() == float(track_file.readline())) - self.failUnless(self.track_obj1.get_dvxmax() == float(track_file.readline())) - self.failUnless(self.track_obj1.get_dvymin() == float(track_file.readline())) - self.failUnless(self.track_obj1.get_dvymax() == float(track_file.readline())) - self.failUnless(self.track_obj1.get_dvzmin() == float(track_file.readline())) - self.failUnless(self.track_obj1.get_dvzmax() == float(track_file.readline())) - self.failUnless(self.track_obj1.get_dangle() == float(track_file.readline())) - self.failUnless(self.track_obj1.get_dacc() == float(track_file.readline())) - self.failUnless(self.track_obj1.get_add() == int(track_file.readline())) + self.assertTrue(self.track_obj1.get_dvxmin() == float(track_file.readline())) + self.assertTrue(self.track_obj1.get_dvxmax() == float(track_file.readline())) + self.assertTrue(self.track_obj1.get_dvymin() == float(track_file.readline())) + self.assertTrue(self.track_obj1.get_dvymax() == float(track_file.readline())) + self.assertTrue(self.track_obj1.get_dvzmin() == float(track_file.readline())) + self.assertTrue(self.track_obj1.get_dvzmax() == float(track_file.readline())) + self.assertTrue(self.track_obj1.get_dangle() == float(track_file.readline())) + self.assertTrue(self.track_obj1.get_dacc() == float(track_file.readline())) + self.assertTrue(self.track_obj1.get_add() == int(track_file.readline())) - self.failUnless(self.track_obj1.get_dsumg() == 0) - self.failUnless(self.track_obj1.get_dn() == 0) - self.failUnless(self.track_obj1.get_dnx() == 0) - self.failUnless(self.track_obj1.get_dny() == 0) + self.assertTrue(self.track_obj1.get_dsumg() == 0) + self.assertTrue(self.track_obj1.get_dn() == 0) + self.assertTrue(self.track_obj1.get_dnx() == 0) + self.assertTrue(self.track_obj1.get_dny() == 0) def test_comparison(self): # create two identical objects @@ -90,14 +90,14 @@ def test_comparison(self): accel_lim=1.1, angle_lim=2.2, add_particle=1, velocity_lims=[[3.3, 4.4], [5.5, 6.6], [7.7, 8.8]]) - self.failUnless(self.track_obj2 == self.track_obj1) - self.failIf(self.track_obj2 != self.track_obj1) + self.assertTrue(self.track_obj2 == self.track_obj1) + self.assertFalse(self.track_obj2 != self.track_obj1) # change one instance variable of track_obj2 and check that the comparisons results are inverted # please note that the operands '==' and '!=' must be checked separately self.track_obj2.set_dvxmin(999.999) - self.failUnless(self.track_obj2 != self.track_obj1) - self.failIf(self.track_obj2 == self.track_obj1) + self.assertTrue(self.track_obj2 != self.track_obj1) + self.assertFalse(self.track_obj2 == self.track_obj1) class Test_SequenceParams(unittest.TestCase): def setUp(self): @@ -111,24 +111,24 @@ def test_read_sequence(self): self.seq_obj.read_sequence_par(self.input_sequence_par_file_name, 4) # check that all parameters are equal to the contents of test file - self.failUnless(self.seq_obj.get_img_base_name(0) == b"dumbbell/cam1_Scene77_") - self.failUnless(self.seq_obj.get_img_base_name(1) == b"dumbbell/cam2_Scene77_") - self.failUnless(self.seq_obj.get_img_base_name(2) == b"dumbbell/cam3_Scene77_") - self.failUnless(self.seq_obj.get_img_base_name(3) == b"dumbbell/cam4_Scene77_") - self.failUnless(self.seq_obj.get_first() == 497) - self.failUnless(self.seq_obj.get_last() == 597) + self.assertTrue(self.seq_obj.get_img_base_name(0) == b"dumbbell/cam1_Scene77_") + self.assertTrue(self.seq_obj.get_img_base_name(1) == b"dumbbell/cam2_Scene77_") + self.assertTrue(self.seq_obj.get_img_base_name(2) == b"dumbbell/cam3_Scene77_") + self.assertTrue(self.seq_obj.get_img_base_name(3) == b"dumbbell/cam4_Scene77_") + self.assertTrue(self.seq_obj.get_first() == 497) + self.assertTrue(self.seq_obj.get_last() == 597) def test_getters_setters(self): cams_num = 4 for cam in range(cams_num): newStr = str(cam) + "some string" + str(cam) self.seq_obj.set_img_base_name(cam, newStr) - self.failUnless(self.seq_obj.get_img_base_name(cam) == newStr.encode()) + self.assertTrue(self.seq_obj.get_img_base_name(cam) == newStr.encode()) self.seq_obj.set_first(1234) - self.failUnless(self.seq_obj.get_first() == 1234) + self.assertTrue(self.seq_obj.get_first() == 1234) self.seq_obj.set_last(5678) - self.failUnless(self.seq_obj.get_last() == 5678) + self.assertTrue(self.seq_obj.get_last() == 5678) # testing __richcmp__ comparison method of SequenceParams class def test_rich_compare(self): @@ -138,12 +138,12 @@ def test_rich_compare(self): self.seq_obj3 = SequenceParams(num_cams=4) self.seq_obj3.read_sequence_par(self.input_sequence_par_file_name, 4) - self.failUnless(self.seq_obj2 == self.seq_obj3) - self.failIf(self.seq_obj2 != self.seq_obj3) + self.assertTrue(self.seq_obj2 == self.seq_obj3) + self.assertFalse(self.seq_obj2 != self.seq_obj3) self.seq_obj2.set_first(-999) - self.failUnless(self.seq_obj2 != self.seq_obj3) - self.failIf(self.seq_obj2 == self.seq_obj3) + self.assertTrue(self.seq_obj2 != self.seq_obj3) + self.assertFalse(self.seq_obj2 == self.seq_obj3) with self.assertRaises(TypeError): var = (self.seq_obj2 > self.seq_obj3) @@ -153,11 +153,11 @@ def test_full_instantiate(self): spar = SequenceParams( image_base=['test1', 'test2'], frame_range=(1, 100)) - print(spar.get_img_base_name(0)) - self.failUnless(spar.get_img_base_name(0) == b"test1") - self.failUnless(spar.get_img_base_name(1) == b"test2") - self.failUnless(spar.get_first() == 1) - self.failUnless(spar.get_last() == 100) + print((spar.get_img_base_name(0))) + self.assertTrue(spar.get_img_base_name(0) == b"test1") + self.assertTrue(spar.get_img_base_name(1) == b"test2") + self.assertTrue(spar.get_first() == 1) + self.assertTrue(spar.get_last() == 100) class Test_VolumeParams(unittest.TestCase): def setUp(self): @@ -180,12 +180,12 @@ def test_read_volume(self): numpy.testing.assert_array_equal(numpy.array([333.333, 444.444]), self.vol_obj.get_Zmin_lay()) numpy.testing.assert_array_equal(numpy.array([555.555, 666.666]), self.vol_obj.get_Zmax_lay()) - self.failUnless(self.vol_obj.get_cnx() == 777.777) - self.failUnless(self.vol_obj.get_cny() == 888.888) - self.failUnless(self.vol_obj.get_cn() == 999.999) - self.failUnless(self.vol_obj.get_csumg() == 1010.1010) - self.failUnless(self.vol_obj.get_corrmin() == 1111.1111) - self.failUnless(self.vol_obj.get_eps0() == 1212.1212) + self.assertTrue(self.vol_obj.get_cnx() == 777.777) + self.assertTrue(self.vol_obj.get_cny() == 888.888) + self.assertTrue(self.vol_obj.get_cn() == 999.999) + self.assertTrue(self.vol_obj.get_csumg() == 1010.1010) + self.assertTrue(self.vol_obj.get_corrmin() == 1111.1111) + self.assertTrue(self.vol_obj.get_eps0() == 1212.1212) def test_setters(self): xlay = numpy.array([111.1, 222.2]) @@ -201,28 +201,28 @@ def test_setters(self): numpy.testing.assert_array_equal(zmax, self.vol_obj.get_Zmax_lay()) self.vol_obj.set_cn(1) - self.failUnless(self.vol_obj.get_cn() == 1) + self.assertTrue(self.vol_obj.get_cn() == 1) self.vol_obj.set_cnx(2) - self.failUnless(self.vol_obj.get_cnx() == 2) + self.assertTrue(self.vol_obj.get_cnx() == 2) self.vol_obj.set_cny(3) - self.failUnless(self.vol_obj.get_cny() == 3) + self.assertTrue(self.vol_obj.get_cny() == 3) self.vol_obj.set_csumg(4) - self.failUnless(self.vol_obj.get_csumg() == 4) + self.assertTrue(self.vol_obj.get_csumg() == 4) self.vol_obj.set_eps0(5) - self.failUnless(self.vol_obj.get_eps0() == 5) + self.assertTrue(self.vol_obj.get_eps0() == 5) self.vol_obj.set_corrmin(6) - self.failUnless(self.vol_obj.get_corrmin() == 6) + self.assertTrue(self.vol_obj.get_corrmin() == 6) def test_init_kwargs(self): """Initialize volume parameters with keyword arguments""" xlay = numpy.array([111.1, 222.2]) zlay = [r_[333.3, 555.5], r_[444.4, 666.6]] - zmin, zmax = zip(*zlay) + zmin, zmax = list(zip(*zlay)) vol_obj = VolumeParams(x_span=xlay, z_spans=zlay, pixels_tot=1, pixels_x=2, pixels_y=3, @@ -232,12 +232,12 @@ def test_init_kwargs(self): numpy.testing.assert_array_equal(zmin, vol_obj.get_Zmin_lay()) numpy.testing.assert_array_equal(zmax, vol_obj.get_Zmax_lay()) - self.failUnless(vol_obj.get_cn() == 1) - self.failUnless(vol_obj.get_cnx() == 2) - self.failUnless(vol_obj.get_cny() == 3) - self.failUnless(vol_obj.get_csumg() == 4) - self.failUnless(vol_obj.get_eps0() == 5) - self.failUnless(vol_obj.get_corrmin() == 6) + self.assertTrue(vol_obj.get_cn() == 1) + self.assertTrue(vol_obj.get_cnx() == 2) + self.assertTrue(vol_obj.get_cny() == 3) + self.assertTrue(vol_obj.get_csumg() == 4) + self.assertTrue(vol_obj.get_eps0() == 5) + self.assertTrue(vol_obj.get_corrmin() == 6) # testing __richcmp__ comparison method of VolumeParams class def test_rich_compare(self): @@ -245,12 +245,12 @@ def test_rich_compare(self): self.vol_obj2.read_volume_par(self.input_volume_par_file_name) self.vol_obj3 = VolumeParams() self.vol_obj3.read_volume_par(self.input_volume_par_file_name) - self.failUnless(self.vol_obj2 == self.vol_obj3) - self.failIf(self.vol_obj2 != self.vol_obj3) + self.assertTrue(self.vol_obj2 == self.vol_obj3) + self.assertFalse(self.vol_obj2 != self.vol_obj3) self.vol_obj2.set_cn(-999) - self.failUnless(self.vol_obj2 != self.vol_obj3) - self.failIf(self.vol_obj2 == self.vol_obj3) + self.assertTrue(self.vol_obj2 != self.vol_obj3) + self.assertFalse(self.vol_obj2 == self.vol_obj3) with self.assertRaises(TypeError): var = (self.vol_obj2 < self.vol_obj3) @@ -274,47 +274,47 @@ def test_read_control(self): # Fill the ControlParams object with parameters from test file self.cp_obj.read_control_par(self.input_control_par_file_name) # check if all parameters are equal to the contents of test file - self.failUnless(self.cp_obj.get_img_base_name(0) == b"dumbbell/cam1_Scene77_4085") - self.failUnless(self.cp_obj.get_img_base_name(1) == b"dumbbell/cam2_Scene77_4085") - self.failUnless(self.cp_obj.get_img_base_name(2) == b"dumbbell/cam3_Scene77_4085") - self.failUnless(self.cp_obj.get_img_base_name(3) == b"dumbbell/cam4_Scene77_4085") - - self.failUnless(self.cp_obj.get_cal_img_base_name(0) == b"cal/cam1.tif") - self.failUnless(self.cp_obj.get_cal_img_base_name(1) == b"cal/cam2.tif") - self.failUnless(self.cp_obj.get_cal_img_base_name(2) == b"cal/cam3.tif") - self.failUnless(self.cp_obj.get_cal_img_base_name(3) == b"cal/cam4.tif") - - self.failUnless(self.cp_obj.get_num_cams() == 4) - self.failUnless(self.cp_obj.get_hp_flag()) - self.failUnless(self.cp_obj.get_allCam_flag()) - self.failUnless(self.cp_obj.get_tiff_flag()) - self.failUnless(self.cp_obj.get_image_size(), (1280, 1024)) - self.failUnless(self.cp_obj.get_pixel_size() == (15.15,16.16)) - self.failUnless(self.cp_obj.get_chfield() == 17) - - self.failUnless(self.cp_obj.get_multimedia_params().get_n1() == 18) - self.failUnless(self.cp_obj.get_multimedia_params().get_n2()[0] == 19.19) - self.failUnless(self.cp_obj.get_multimedia_params().get_n3() == 20.20) - self.failUnless(self.cp_obj.get_multimedia_params().get_d()[0] == 21.21) + self.assertTrue(self.cp_obj.get_img_base_name(0) == b"dumbbell/cam1_Scene77_4085") + self.assertTrue(self.cp_obj.get_img_base_name(1) == b"dumbbell/cam2_Scene77_4085") + self.assertTrue(self.cp_obj.get_img_base_name(2) == b"dumbbell/cam3_Scene77_4085") + self.assertTrue(self.cp_obj.get_img_base_name(3) == b"dumbbell/cam4_Scene77_4085") + + self.assertTrue(self.cp_obj.get_cal_img_base_name(0) == b"cal/cam1.tif") + self.assertTrue(self.cp_obj.get_cal_img_base_name(1) == b"cal/cam2.tif") + self.assertTrue(self.cp_obj.get_cal_img_base_name(2) == b"cal/cam3.tif") + self.assertTrue(self.cp_obj.get_cal_img_base_name(3) == b"cal/cam4.tif") + + self.assertTrue(self.cp_obj.get_num_cams() == 4) + self.assertTrue(self.cp_obj.get_hp_flag()) + self.assertTrue(self.cp_obj.get_allCam_flag()) + self.assertTrue(self.cp_obj.get_tiff_flag()) + self.assertTrue(self.cp_obj.get_image_size(), (1280, 1024)) + self.assertTrue(self.cp_obj.get_pixel_size() == (15.15,16.16)) + self.assertTrue(self.cp_obj.get_chfield() == 17) + + self.assertTrue(self.cp_obj.get_multimedia_params().get_n1() == 18) + self.assertTrue(self.cp_obj.get_multimedia_params().get_n2()[0] == 19.19) + self.assertTrue(self.cp_obj.get_multimedia_params().get_n3() == 20.20) + self.assertTrue(self.cp_obj.get_multimedia_params().get_d()[0] == 21.21) def test_instantiate_fast(self): """ControlParams instantiation through constructor""" cp = ControlParams(4, ['headers', 'hp', 'allcam'], (1280, 1024), (15.15,16.16), 18, [19.19], [21.21], 20.20) - self.failUnless(cp.get_num_cams() == 4) - self.failUnless(cp.get_hp_flag()) - self.failUnless(cp.get_allCam_flag()) - self.failUnless(cp.get_tiff_flag()) - self.failUnless(cp.get_image_size(), (1280, 1024)) - self.failUnless(cp.get_pixel_size() == (15.15,16.16)) - self.failUnless(cp.get_chfield() == 0) + self.assertTrue(cp.get_num_cams() == 4) + self.assertTrue(cp.get_hp_flag()) + self.assertTrue(cp.get_allCam_flag()) + self.assertTrue(cp.get_tiff_flag()) + self.assertTrue(cp.get_image_size(), (1280, 1024)) + self.assertTrue(cp.get_pixel_size() == (15.15,16.16)) + self.assertTrue(cp.get_chfield() == 0) mm = cp.get_multimedia_params() - self.failUnless(mm.get_n1() == 18) - self.failUnless(mm.get_n2()[0] == 19.19) - self.failUnless(mm.get_n3() == 20.20) - self.failUnless(mm.get_d()[0] == 21.21) + self.assertTrue(mm.get_n1() == 18) + self.assertTrue(mm.get_n2()[0] == 19.19) + self.assertTrue(mm.get_n3() == 20.20) + self.assertTrue(mm.get_d()[0] == 21.21) def test_getters_setters(self): @@ -323,34 +323,34 @@ def test_getters_setters(self): new_str = str(cam) + "some string" + str(cam) self.cp_obj.set_img_base_name(cam, new_str) - self.failUnless(self.cp_obj.get_img_base_name(cam) == new_str.encode()) + self.assertTrue(self.cp_obj.get_img_base_name(cam) == new_str.encode()) self.cp_obj.set_cal_img_base_name(cam, new_str) - self.failUnless(self.cp_obj.get_cal_img_base_name(cam) == new_str.encode()) + self.assertTrue(self.cp_obj.get_cal_img_base_name(cam) == new_str.encode()) self.cp_obj.set_hp_flag(True) - self.failUnless(self.cp_obj.get_hp_flag()) + self.assertTrue(self.cp_obj.get_hp_flag()) self.cp_obj.set_hp_flag(False) - self.failUnless(not self.cp_obj.get_hp_flag()) + self.assertTrue(not self.cp_obj.get_hp_flag()) self.cp_obj.set_allCam_flag(True) - self.failUnless(self.cp_obj.get_allCam_flag()) + self.assertTrue(self.cp_obj.get_allCam_flag()) self.cp_obj.set_allCam_flag(False) - self.failUnless(not self.cp_obj.get_allCam_flag()) + self.assertTrue(not self.cp_obj.get_allCam_flag()) self.cp_obj.set_tiff_flag(True) - self.failUnless(self.cp_obj.get_tiff_flag()) + self.assertTrue(self.cp_obj.get_tiff_flag()) self.cp_obj.set_tiff_flag(False) - self.failUnless(not self.cp_obj.get_tiff_flag()) + self.assertTrue(not self.cp_obj.get_tiff_flag()) self.cp_obj.set_image_size((4, 5)) - self.failUnless(self.cp_obj.get_image_size()== (4, 5)) - print(self.cp_obj.get_pixel_size()) + self.assertTrue(self.cp_obj.get_image_size()== (4, 5)) + print((self.cp_obj.get_pixel_size())) self.cp_obj.set_pixel_size((6.1, 7.0)) numpy.testing.assert_array_equal(self.cp_obj.get_pixel_size(), (6.1, 7)) self.cp_obj.set_chfield(8) - self.failUnless(self.cp_obj.get_chfield() == 8) + self.assertTrue(self.cp_obj.get_chfield() == 8) # testing __richcmp__ comparison method of ControlParams class def test_rich_compare(self): @@ -360,12 +360,12 @@ def test_rich_compare(self): self.cp_obj3 = ControlParams(4) self.cp_obj3.read_control_par(self.input_control_par_file_name) - self.failUnless(self.cp_obj2 == self.cp_obj3) - self.failIf(self.cp_obj2 != self.cp_obj3) + self.assertTrue(self.cp_obj2 == self.cp_obj3) + self.assertFalse(self.cp_obj2 != self.cp_obj3) self.cp_obj2.set_hp_flag(False) - self.failUnless(self.cp_obj2 != self.cp_obj3) - self.failIf(self.cp_obj2 == self.cp_obj3) + self.assertTrue(self.cp_obj2 != self.cp_obj3) + self.assertFalse(self.cp_obj2 == self.cp_obj3) with self.assertRaises(TypeError): var = (self.cp_obj2 > self.cp_obj3) # unhandled operator > diff --git a/py_bind/test/test_tracker.py b/py_bind/test/test_tracker.py index 0d31debf..9f860ac0 100644 --- a/py_bind/test/test_tracker.py +++ b/py_bind/test/test_tracker.py @@ -8,7 +8,10 @@ @author: yosef """ -import unittest, yaml, shutil, os +import unittest +import yaml +import shutil +import os from optv.tracker import Tracker from optv.calibration import Calibration from optv.parameters import ControlParams, VolumeParams, TrackingParams, \ @@ -19,69 +22,76 @@ 'linkage': b'testing_fodder/track/res/linkage', 'prio': b'testing_fodder/track/res/whatever' } + + class TestTracker(unittest.TestCase): def setUp(self): with open(b"testing_fodder/track/conf.yaml") as f: - yaml_conf = yaml.load(f) + yaml_conf = yaml.load(f, Loader=yaml.FullLoader) seq_cfg = yaml_conf['sequence'] - + cals = [] img_base = [] - print(yaml_conf['cameras']) + print((yaml_conf['cameras'])) for cix, cam_spec in enumerate(yaml_conf['cameras']): cam_spec.setdefault(b'addpar_file', None) cal = Calibration() - cal.from_file(cam_spec['ori_file'].encode(), cam_spec['addpar_file'].encode()) + cal.from_file(cam_spec['ori_file'].encode(), + cam_spec['addpar_file'].encode()) cals.append(cal) img_base.append(seq_cfg['targets_template'].format(cam=cix + 1)) - + cpar = ControlParams(len(yaml_conf['cameras']), **yaml_conf['scene']) vpar = VolumeParams(**yaml_conf['correspondences']) tpar = TrackingParams(**yaml_conf['tracking']) spar = SequenceParams( image_base=img_base, frame_range=(seq_cfg['first'], seq_cfg['last'])) - + self.tracker = Tracker(cpar, vpar, tpar, spar, cals, framebuf_naming) - + def test_forward(self): """Manually running a full forward tracking run.""" shutil.copytree( "testing_fodder/track/res_orig/", "testing_fodder/track/res/") - + self.tracker.restart() - last_step = 1 + last_step = 10001 while self.tracker.step_forward(): - self.failUnless(self.tracker.current_step() > last_step) + # print(f"step is {self.tracker.current_step()}\n") + # print(self.tracker.current_step() > last_step) + self.assertTrue(self.tracker.current_step() > last_step) with open("testing_fodder/track/res/linkage.%d" % last_step) as f: lines = f.readlines() - if last_step < 3: - self.failUnless(lines[0] == "1\n") + # print(last_step,lines[0]) + if last_step == 10003: + self.assertTrue(lines[0] == "-1\n") else: - self.failUnless(lines[0] == "2\n") + self.assertTrue(lines[0] == "1\n") last_step += 1 self.tracker.finalize() - + def test_full_forward(self): """Automatic full forward tracking run.""" shutil.copytree( "testing_fodder/track/res_orig/", "testing_fodder/track/res/") self.tracker.full_forward() - # if it passes without error, we assume it's ok. The actual test is in + # if it passes without error, we assume it's ok. The actual test is in # the C code. - + def test_full_backward(self): """Automatic full backward correction phase.""" shutil.copytree( "testing_fodder/track/res_orig/", "testing_fodder/track/res/") self.tracker.full_forward() self.tracker.full_backward() - # if it passes without error, we assume it's ok. The actual test is in + # if it passes without error, we assume it's ok. The actual test is in # the C code. - + def tearDown(self): if os.path.exists("testing_fodder/track/res/"): shutil.rmtree("testing_fodder/track/res/") - + + if __name__ == "__main__": unittest.main() diff --git a/py_bind/test/test_trafo_bindings.py b/py_bind/test/test_trafo_bindings.py index fd800c27..82840704 100644 --- a/py_bind/test/test_trafo_bindings.py +++ b/py_bind/test/test_trafo_bindings.py @@ -143,7 +143,7 @@ def test_brown_affine(self): # Some small radial distortion: cal.set_radial_distortion(np.r_[0.001, 0., 0.]) distorted = distort_arr_brown_affine(ref_pos, cal) - self.failUnless(np.all(abs(distorted) > abs(ref_pos))) + self.assertTrue(np.all(abs(distorted) > abs(ref_pos))) def test_full_correction(self): """Round trip distortion/correction.""" diff --git a/py_bind/test/testing_fodder/burgers/README.md b/py_bind/test/testing_fodder/burgers/README.md new file mode 100644 index 00000000..31040cb5 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/README.md @@ -0,0 +1,2 @@ +# Burgers_test_ALEXL +Alex Ruiz @alexruiz95 created PTV_SYN package in Matlab that generates thes small test data diff --git a/py_bind/test/testing_fodder/burgers/addpar.raw b/py_bind/test/testing_fodder/burgers/addpar.raw new file mode 100755 index 00000000..aab3cf2e --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/addpar.raw @@ -0,0 +1 @@ +0 0 0 0 0 1 0 diff --git a/py_bind/test/testing_fodder/burgers/cal/cam1.tif b/py_bind/test/testing_fodder/burgers/cal/cam1.tif new file mode 100755 index 00000000..c32b74dd Binary files /dev/null and b/py_bind/test/testing_fodder/burgers/cal/cam1.tif differ diff --git a/py_bind/test/testing_fodder/burgers/cal/cam1.tif.addpar b/py_bind/test/testing_fodder/burgers/cal/cam1.tif.addpar new file mode 100755 index 00000000..e2012572 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/cal/cam1.tif.addpar @@ -0,0 +1 @@ +0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 1.00000000 0.00000000 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/burgers/cal/cam1.tif.ori b/py_bind/test/testing_fodder/burgers/cal/cam1.tif.ori new file mode 100755 index 00000000..a44f4ce6 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/cal/cam1.tif.ori @@ -0,0 +1,11 @@ +-50.97682484 51.05907553 204.08913317 + -0.24511426 -0.23776868 -0.05888177 + + 0.9701817 0.0571921 -0.2355347 + -0.0000313 0.9717919 0.2358400 + 0.2423789 -0.2288002 0.9428165 + + 0.0000 0.0000 + 80.0000 + + 0.000100000000000 0.000100000000000 0.000100000000000 diff --git a/py_bind/test/testing_fodder/burgers/cal/cam2.tif b/py_bind/test/testing_fodder/burgers/cal/cam2.tif new file mode 100755 index 00000000..e60fd447 Binary files /dev/null and b/py_bind/test/testing_fodder/burgers/cal/cam2.tif differ diff --git a/py_bind/test/testing_fodder/burgers/cal/cam2.tif.addpar b/py_bind/test/testing_fodder/burgers/cal/cam2.tif.addpar new file mode 100755 index 00000000..e2012572 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/cal/cam2.tif.addpar @@ -0,0 +1 @@ +0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 1.00000000 0.00000000 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/burgers/cal/cam2.tif.ori b/py_bind/test/testing_fodder/burgers/cal/cam2.tif.ori new file mode 100755 index 00000000..c26095bd --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/cal/cam2.tif.ori @@ -0,0 +1,11 @@ +50.97160633 51.05627373 204.08868177 + -0.24509662 0.23766561 0.05887799 + + 0.9702061 -0.0571899 0.2354345 + 0.0000562 0.9717945 0.2358292 + -0.2422810 -0.2287897 0.9428442 + + 0.0000 0.0000 + 80.0000 + + 0.000100000000000 0.000100000000000 0.000100000000000 diff --git a/py_bind/test/testing_fodder/burgers/cal/cam3.tif b/py_bind/test/testing_fodder/burgers/cal/cam3.tif new file mode 100755 index 00000000..c669bb20 Binary files /dev/null and b/py_bind/test/testing_fodder/burgers/cal/cam3.tif differ diff --git a/py_bind/test/testing_fodder/burgers/cal/cam3.tif.addpar b/py_bind/test/testing_fodder/burgers/cal/cam3.tif.addpar new file mode 100755 index 00000000..e2012572 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/cal/cam3.tif.addpar @@ -0,0 +1 @@ +0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 1.00000000 0.00000000 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/burgers/cal/cam3.tif.ori b/py_bind/test/testing_fodder/burgers/cal/cam3.tif.ori new file mode 100755 index 00000000..c7a2ffb9 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/cal/cam3.tif.ori @@ -0,0 +1,11 @@ +-50.97331065 -51.06080041 204.09230787 + 0.24520168 -0.23774465 0.05891347 + + 0.9701855 -0.0572232 -0.2355113 + 0.0000466 0.9717716 -0.2359238 + 0.2423635 0.2288788 0.9428014 + + 0.0000 0.0000 + 80.0000 + + 0.000100000000000 0.000100000000000 0.000100000000000 diff --git a/py_bind/test/testing_fodder/burgers/cal/cam4.tif b/py_bind/test/testing_fodder/burgers/cal/cam4.tif new file mode 100755 index 00000000..a6db8bb3 Binary files /dev/null and b/py_bind/test/testing_fodder/burgers/cal/cam4.tif differ diff --git a/py_bind/test/testing_fodder/burgers/cal/cam4.tif.addpar b/py_bind/test/testing_fodder/burgers/cal/cam4.tif.addpar new file mode 100755 index 00000000..e2012572 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/cal/cam4.tif.addpar @@ -0,0 +1 @@ +0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 1.00000000 0.00000000 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/burgers/cal/cam4.tif.ori b/py_bind/test/testing_fodder/burgers/cal/cam4.tif.ori new file mode 100755 index 00000000..83c9a92c --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/cal/cam4.tif.ori @@ -0,0 +1,11 @@ +50.96733824 -51.07163412 204.09103496 + 0.24524901 0.23763496 -0.05891113 + + 0.9702114 0.0572225 0.2354047 + -0.0000587 0.9717592 -0.2359746 + -0.2422597 0.2289315 0.9428152 + + 0.0000 0.0000 + 80.0000 + + 0.000100000000000 0.000100000000000 0.000100000000000 diff --git a/py_bind/test/testing_fodder/burgers/cal/target_file.txt b/py_bind/test/testing_fodder/burgers/cal/target_file.txt new file mode 100755 index 00000000..30e0de5d --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/cal/target_file.txt @@ -0,0 +1,25 @@ +1 -6.4 6.4 3.2 +2 -3.2 6.4 1.6 +3 0 6.4 0 +4 3.2 6.4 1.6 +5 6.4 6.4 3.2 +6 -6.4 3.2 3.2 +7 -3.2 3.2 1.6 +8 0 3.2 0 +9 3.2 3.2 1.6 +10 6.4 3.2 3.2 +11 -6.4 0 3.2 +12 -3.2 0 1.6 +13 0 0 0 +14 3.2 0 1.6 +15 6.4 0 3.2 +16 -6.4 -3.2 3.2 +17 -3.2 -3.2 1.6 +18 0 -3.2 0 +19 3.2 -3.2 1.6 +20 6.4 -3.2 3.2 +21 -6.4 -6.4 3.2 +22 -3.2 -6.4 1.6 +23 0 -6.4 0 +24 3.2 -6.4 1.6 +25 6.4 -6.4 3.2 diff --git a/py_bind/test/testing_fodder/burgers/conf.yaml b/py_bind/test/testing_fodder/burgers/conf.yaml new file mode 100644 index 00000000..ec2e6a3c --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/conf.yaml @@ -0,0 +1,50 @@ +# Values taken from the parameters used in the C test for adding a particle. + +cameras: + - ori_file: testing_fodder/burgers/cal/cam1.tif.ori + addpar_file: testing_fodder/burgers/cal/cam1.tif.addpar + + - ori_file: testing_fodder/burgers/cal/cam2.tif.ori + addpar_file: testing_fodder/burgers/cal/cam2.tif.addpar + + - ori_file: testing_fodder/burgers/cal/cam3.tif.ori + addpar_file: testing_fodder/burgers/cal/cam3.tif.addpar + + - ori_file: testing_fodder/burgers/cal/cam4.tif.ori + addpar_file: testing_fodder/burgers/cal/cam4.tif.addpar + +scene: + flags: hp, headers + image_size: [ 1024, 1024 ] + pixel_size: [ 0.0065, 0.0065 ] + + # Multimedia parameters: + cam_side_n: 1 + object_side_n: 1 + wall_ns: [ 1 ] + wall_thicks: [ 1.0 ] + +correspondences: + x_span: [-40., 40.] + z_spans: + - [-10., 10.] + - [-10., 10.] + + pixels_x: 0.02 + pixels_y: 0.02 + pixels_tot: 0.02 + + ref_gray: 0.02 + min_correlation: 33 + epipolar_band: 0.01 # mm on sensor plane. + +sequence: + targets_template: testing_fodder/burgers/img/cam{cam:1d}. + first: 10001 + last: 10005 + +tracking: + velocity_lims: [[-0.5, 0.5], [-0.5, 0.5], [-0.5, 0.5]] + angle_lim: 100 + accel_lim: 0.1 + add_particle: 0 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam1.10001_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam1.10001_targets new file mode 100755 index 00000000..b3a44092 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam1.10001_targets @@ -0,0 +1,6 @@ +5 + 0 682.6395 209.0708 11 3 4 913 1 + 1 717.7905 290.5056 9 3 3 718 0 + 2 798.8343 363.6931 8 3 3 667 2 + 3 686.2139 413.0904 9 3 4 692 4 + 4 723.3933 445.4747 9 3 3 716 3 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam1.10002_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam1.10002_targets new file mode 100755 index 00000000..5a34aa55 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam1.10002_targets @@ -0,0 +1,6 @@ +5 + 0 678.6480 207.1554 11 4 4 913 2 + 1 714.0000 288.0268 11 4 4 776 0 + 2 796.3027 360.0280 9 3 4 735 1 + 3 683.5204 409.7245 9 3 3 703 3 + 4 721.9586 441.2983 9 4 3 722 4 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam1.10003_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam1.10003_targets new file mode 100755 index 00000000..9da51ad9 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam1.10003_targets @@ -0,0 +1,6 @@ +5 + 0 674.5351 205.1557 11 4 4 896 0 + 1 710.1342 285.5885 8 3 3 659 1 + 2 793.5925 356.3209 9 3 3 695 -1 + 3 680.8589 406.4123 8 4 3 685 2 + 4 720.5765 436.9646 9 3 4 713 3 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam1.10004_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam1.10004_targets new file mode 100755 index 00000000..9f5adec2 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam1.10004_targets @@ -0,0 +1,6 @@ +5 + 0 670.4116 203.2069 9 3 3 824 4 + 1 706.2595 283.3449 8 3 3 636 3 + 2 790.6713 352.8039 9 4 3 722 1 + 3 678.0994 403.2062 8 3 4 657 2 + 4 719.0487 432.8231 9 4 4 719 0 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam1.10005_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam1.10005_targets new file mode 100755 index 00000000..7f55e937 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam1.10005_targets @@ -0,0 +1,6 @@ +5 + 0 666.2289 201.3933 10 4 3 850 0 + 1 702.4419 281.1279 8 3 4 664 4 + 2 787.8819 349.2930 9 3 3 703 1 + 3 675.2969 400.0964 10 4 4 789 2 + 4 717.4888 428.7353 8 3 3 677 3 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam2.10001_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam2.10001_targets new file mode 100755 index 00000000..d5852acd --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam2.10001_targets @@ -0,0 +1,6 @@ +5 + 0 672.1364 226.5973 11 4 4 913 1 + 1 651.7522 309.4883 8 3 3 661 0 + 2 719.8757 391.5578 9 4 3 706 2 + 3 640.5206 430.3737 9 3 3 748 4 + 4 708.5805 469.1351 8 3 4 668 3 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam2.10002_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam2.10002_targets new file mode 100755 index 00000000..56ad58d0 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam2.10002_targets @@ -0,0 +1,6 @@ +5 + 0 667.9233 224.2927 12 4 4 943 2 + 1 647.9502 306.5772 8 4 3 631 0 + 2 717.2707 387.4890 8 3 3 682 1 + 3 637.7520 426.7033 8 3 3 689 3 + 4 707.2652 464.6823 8 3 3 682 4 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam2.10003_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam2.10003_targets new file mode 100755 index 00000000..44968645 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam2.10003_targets @@ -0,0 +1,6 @@ +5 + 0 663.7162 221.7950 11 4 4 884 0 + 1 643.9618 303.6804 9 4 3 687 1 + 2 714.5111 383.5443 9 3 3 721 -1 + 3 635.0750 423.0361 11 4 4 800 2 + 4 705.7514 460.3314 8 3 3 670 3 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam2.10004_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam2.10004_targets new file mode 100755 index 00000000..5a28b2f1 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam2.10004_targets @@ -0,0 +1,6 @@ +5 + 0 659.6828 219.5063 13 4 4 996 4 + 1 640.0653 300.8769 9 4 4 689 3 + 2 711.6368 379.5974 9 3 3 740 1 + 3 632.1715 419.5581 8 4 3 664 2 + 4 704.1949 455.8656 8 4 3 651 0 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam2.10005_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam2.10005_targets new file mode 100755 index 00000000..30dc5061 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam2.10005_targets @@ -0,0 +1,6 @@ +5 + 0 655.4760 217.1353 11 3 4 939 0 + 1 636.0625 298.2094 9 3 4 680 4 + 2 708.6780 375.7404 9 3 4 697 1 + 3 629.2493 415.9714 9 3 4 727 2 + 4 702.5222 451.5389 9 3 3 720 3 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam3.10001_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam3.10001_targets new file mode 100755 index 00000000..5cc56558 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam3.10001_targets @@ -0,0 +1,6 @@ +5 + 0 680.5740 221.0666 11 3 4 913 1 + 1 715.8280 250.3328 8 3 3 631 0 + 2 796.9490 317.6943 7 3 3 594 2 + 3 685.3590 387.5691 9 3 3 736 4 + 4 722.8054 454.1617 8 3 3 654 3 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam3.10002_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam3.10002_targets new file mode 100755 index 00000000..004ca618 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam3.10002_targets @@ -0,0 +1,6 @@ +5 + 0 676.5571 218.6692 11 4 4 895 2 + 1 712.0689 247.4062 9 4 3 701 0 + 2 794.3276 313.8046 8 3 3 668 1 + 3 682.7578 384.0382 10 4 4 753 3 + 4 721.4788 449.7037 9 3 3 738 4 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam3.10003_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam3.10003_targets new file mode 100755 index 00000000..557e52e5 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam3.10003_targets @@ -0,0 +1,6 @@ +5 + 0 672.5151 216.2866 11 4 4 904 0 + 1 708.2282 244.5647 8 3 3 629 1 + 2 791.4198 309.8410 10 3 4 749 -1 + 3 680.0387 380.4691 9 4 3 748 2 + 4 719.9485 445.4081 9 4 3 719 3 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam3.10004_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam3.10004_targets new file mode 100755 index 00000000..3493b2a4 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam3.10004_targets @@ -0,0 +1,6 @@ +5 + 0 668.3939 213.8701 10 3 4 862 4 + 1 704.3237 241.7340 8 3 3 649 3 + 2 788.7273 305.9830 8 3 4 672 1 + 3 677.2479 376.7885 8 3 3 677 2 + 4 718.5055 441.1381 9 3 4 722 0 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam3.10005_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam3.10005_targets new file mode 100755 index 00000000..3552ddd4 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam3.10005_targets @@ -0,0 +1,6 @@ +5 + 0 664.3727 211.6458 11 4 3 927 0 + 1 700.4377 239.1760 9 3 4 681 4 + 2 785.8138 302.1364 11 4 4 781 1 + 3 674.3384 373.3830 9 3 3 719 2 + 4 716.7587 436.8040 9 3 4 735 3 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam4.10001_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam4.10001_targets new file mode 100755 index 00000000..99589601 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam4.10001_targets @@ -0,0 +1,6 @@ +5 + 0 670.1549 199.7945 12 4 4 935 1 + 1 650.3690 228.2024 8 3 3 656 0 + 2 718.5000 286.6521 9 3 3 715 2 + 3 639.8913 368.9076 10 4 4 768 4 + 4 708.1207 429.5517 9 4 3 708 3 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam4.10002_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam4.10002_targets new file mode 100755 index 00000000..9d2420db --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam4.10002_targets @@ -0,0 +1,6 @@ +5 + 0 665.9357 197.8007 12 4 4 939 2 + 1 646.5570 225.6254 9 3 3 711 0 + 2 715.6959 282.9620 9 4 4 702 1 + 3 637.1497 365.5339 8 3 3 674 3 + 4 706.6294 425.3020 8 3 3 714 4 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam4.10003_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam4.10003_targets new file mode 100755 index 00000000..ca85fc60 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam4.10003_targets @@ -0,0 +1,6 @@ +5 + 0 661.9150 195.9901 12 4 4 933 0 + 1 642.7049 223.3544 8 3 3 691 1 + 2 712.9576 279.3788 8 4 3 650 -1 + 3 634.3665 362.3523 8 3 3 672 2 + 4 705.2455 421.1121 10 3 4 730 3 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam4.10004_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam4.10004_targets new file mode 100755 index 00000000..cce0ac6c --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam4.10004_targets @@ -0,0 +1,6 @@ +5 + 0 657.7206 194.1597 13 4 4 996 4 + 1 638.7906 221.1438 8 3 3 640 3 + 2 710.0886 275.8576 10 4 3 716 1 + 3 631.5367 359.0480 9 3 4 714 2 + 4 703.5784 416.9342 9 3 4 717 0 diff --git a/py_bind/test/testing_fodder/burgers/img_orig/cam4.10005_targets b/py_bind/test/testing_fodder/burgers/img_orig/cam4.10005_targets new file mode 100755 index 00000000..ec02a178 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/img_orig/cam4.10005_targets @@ -0,0 +1,6 @@ +5 + 0 653.6208 192.5416 11 4 4 945 0 + 1 634.8417 218.8386 9 4 3 679 4 + 2 707.2302 272.3665 9 3 3 727 1 + 3 628.6469 356.0028 8 3 4 674 2 + 4 702.0331 412.8072 9 4 4 692 3 diff --git a/py_bind/test/testing_fodder/burgers/man_ori.dat b/py_bind/test/testing_fodder/burgers/man_ori.dat new file mode 100755 index 00000000..5f99f904 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/man_ori.dat @@ -0,0 +1,16 @@ +204.000000 206.000000 +825.000000 201.000000 +204.000000 825.000000 +829.000000 822.000000 +202.000000 199.000000 +819.000000 208.000000 +199.000000 823.000000 +823.000000 824.000000 +198.000000 194.000000 +832.000000 203.000000 +206.000000 816.000000 +824.000000 827.000000 +197.000000 202.000000 +824.000000 201.000000 +203.000000 825.000000 +820.000000 819.000000 diff --git a/py_bind/test/testing_fodder/burgers/parameters/cal_ori.par b/py_bind/test/testing_fodder/burgers/parameters/cal_ori.par new file mode 100644 index 00000000..216ad807 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/cal_ori.par @@ -0,0 +1,12 @@ +cal/target_file.txt +cal/cam1.tif +cal/cam1.tif.ori +cal/cam2.tif +cal/cam2.tif.ori +cal/cam3.tif +cal/cam3.tif.ori +cal/cam4.tif +cal/cam4.tif.ori +1 +1 +0 diff --git a/py_bind/test/testing_fodder/burgers/parameters/criteria.par b/py_bind/test/testing_fodder/burgers/parameters/criteria.par new file mode 100644 index 00000000..74445bcc --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/criteria.par @@ -0,0 +1,12 @@ +-40 +-10 +10 +40 +-10 +10 +0.02 +0.02 +0.02 +0.02 +33 +0.01 diff --git a/py_bind/test/testing_fodder/burgers/parameters/detect_plate.par b/py_bind/test/testing_fodder/burgers/parameters/detect_plate.par new file mode 100644 index 00000000..b15c04fc --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/detect_plate.par @@ -0,0 +1,13 @@ +95 +65 +95 +85 +600 +3 +400 +3 +150 +3 +150 +200 +3 diff --git a/py_bind/test/testing_fodder/burgers/parameters/dumbbell.par b/py_bind/test/testing_fodder/burgers/parameters/dumbbell.par new file mode 100644 index 00000000..185ea3d2 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/dumbbell.par @@ -0,0 +1,6 @@ +3.000000 +25.000000 +0.050000 +1.000000 +1 +500 diff --git a/py_bind/test/testing_fodder/burgers/parameters/examine.par b/py_bind/test/testing_fodder/burgers/parameters/examine.par new file mode 100644 index 00000000..aeba736d --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/examine.par @@ -0,0 +1,2 @@ +0 +0 diff --git a/py_bind/test/testing_fodder/burgers/parameters/man_ori.dat b/py_bind/test/testing_fodder/burgers/parameters/man_ori.dat new file mode 100644 index 00000000..5f99f904 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/man_ori.dat @@ -0,0 +1,16 @@ +204.000000 206.000000 +825.000000 201.000000 +204.000000 825.000000 +829.000000 822.000000 +202.000000 199.000000 +819.000000 208.000000 +199.000000 823.000000 +823.000000 824.000000 +198.000000 194.000000 +832.000000 203.000000 +206.000000 816.000000 +824.000000 827.000000 +197.000000 202.000000 +824.000000 201.000000 +203.000000 825.000000 +820.000000 819.000000 diff --git a/py_bind/test/testing_fodder/burgers/parameters/man_ori.par b/py_bind/test/testing_fodder/burgers/parameters/man_ori.par new file mode 100644 index 00000000..02c3f945 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/man_ori.par @@ -0,0 +1,16 @@ +1 +5 +21 +25 +1 +5 +21 +25 +1 +5 +21 +25 +1 +5 +21 +25 diff --git a/py_bind/test/testing_fodder/burgers/parameters/multi_planes.par b/py_bind/test/testing_fodder/burgers/parameters/multi_planes.par new file mode 100644 index 00000000..87780cac --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/multi_planes.par @@ -0,0 +1,4 @@ +3 +img/calib_a_cam +img/calib_b_cam +img/calib_c_cam \ No newline at end of file diff --git a/py_bind/test/testing_fodder/burgers/parameters/orient.par b/py_bind/test/testing_fodder/burgers/parameters/orient.par new file mode 100644 index 00000000..d4170535 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/orient.par @@ -0,0 +1,12 @@ +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 diff --git a/py_bind/test/testing_fodder/burgers/parameters/pft_version b/py_bind/test/testing_fodder/burgers/parameters/pft_version new file mode 100644 index 00000000..00750edc --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/pft_version @@ -0,0 +1 @@ +3 diff --git a/py_bind/test/testing_fodder/burgers/parameters/pft_version.par b/py_bind/test/testing_fodder/burgers/parameters/pft_version.par new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/pft_version.par @@ -0,0 +1 @@ +0 diff --git a/py_bind/test/testing_fodder/burgers/parameters/ptv.par b/py_bind/test/testing_fodder/burgers/parameters/ptv.par new file mode 100644 index 00000000..4908b4a2 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/ptv.par @@ -0,0 +1,21 @@ +4 +img/cam1.10001 +cal/cam1.tif +img/cam2.10001 +cal/cam2.tif +img/cam3.10001 +cal/cam3.tif +img/cam4.10001 +cal/cam4.tif +0 +0 +1 +1024 +1024 +0.0065 +0.0065 +0 +1 +1 +1 +1 diff --git a/py_bind/test/testing_fodder/burgers/parameters/sequence.par b/py_bind/test/testing_fodder/burgers/parameters/sequence.par new file mode 100644 index 00000000..5dfd7599 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/sequence.par @@ -0,0 +1,6 @@ +img/cam1. +img/cam2. +img/cam3. +img/cam4. +10001 +10005 diff --git a/py_bind/test/testing_fodder/burgers/parameters/shaking.par b/py_bind/test/testing_fodder/burgers/parameters/shaking.par new file mode 100644 index 00000000..9878214b --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/shaking.par @@ -0,0 +1,4 @@ +10000 +10004 +10 +5 diff --git a/py_bind/test/testing_fodder/burgers/parameters/sortgrid.par b/py_bind/test/testing_fodder/burgers/parameters/sortgrid.par new file mode 100644 index 00000000..2edeafb0 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/sortgrid.par @@ -0,0 +1 @@ +20 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/burgers/parameters/targ_rec.par b/py_bind/test/testing_fodder/burgers/parameters/targ_rec.par new file mode 100644 index 00000000..84933204 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/targ_rec.par @@ -0,0 +1,13 @@ +40 +40 +40 +40 +200 +1 +500 +1 +100 +1 +100 +150 +2 diff --git a/py_bind/test/testing_fodder/burgers/parameters/track.par b/py_bind/test/testing_fodder/burgers/parameters/track.par new file mode 100644 index 00000000..1f28a200 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/track.par @@ -0,0 +1,9 @@ +-0.5 +0.5 +-0.5 +0.5 +-0.5 +0.5 +100 +0.1 +0 diff --git a/py_bind/test/testing_fodder/burgers/parameters/unsharp_mask.par b/py_bind/test/testing_fodder/burgers/parameters/unsharp_mask.par new file mode 100644 index 00000000..3cacc0b9 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/parameters/unsharp_mask.par @@ -0,0 +1 @@ +12 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10001 b/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10001 new file mode 100644 index 00000000..68f17c36 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10001 @@ -0,0 +1,6 @@ +5 + 1 3.095 4.352 2.401 1 1 1 1 + 2 2.983 5.391 0.419 0 0 0 0 + 3 4.425 3.087 2.906 2 2 2 2 + 4 3.693 1.136 0.596 4 4 4 4 + 5 2.727 2.022 1.677 3 3 3 3 diff --git a/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10002 b/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10002 new file mode 100644 index 00000000..670fe6ae --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10002 @@ -0,0 +1,6 @@ +5 + 1 3.027 4.401 2.403 1 1 1 1 + 2 4.378 3.155 2.907 2 2 2 2 + 3 2.909 5.429 0.424 0 0 0 0 + 4 2.679 2.085 1.678 3 3 3 3 + 5 3.668 1.214 0.597 4 4 4 4 diff --git a/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10003 b/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10003 new file mode 100644 index 00000000..b4436f3c --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10003 @@ -0,0 +1,5 @@ +4 + 1 2.835 5.469 0.422 0 0 0 0 + 2 2.957 4.448 2.402 1 1 1 1 + 3 2.630 2.147 1.677 3 3 3 3 + 4 3.642 1.292 0.595 4 4 4 4 diff --git a/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10004 b/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10004 new file mode 100644 index 00000000..ebf4adb8 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10004 @@ -0,0 +1,6 @@ +5 + 1 3.614 1.369 0.596 4 4 4 4 + 2 4.277 3.289 2.906 2 2 2 2 + 3 2.579 2.208 1.681 3 3 3 3 + 4 2.887 4.493 2.402 1 1 1 1 + 5 2.761 5.507 0.422 0 0 0 0 diff --git a/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10005 b/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10005 new file mode 100644 index 00000000..392f06cd --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10005 @@ -0,0 +1,6 @@ +5 + 1 2.686 5.543 0.420 0 0 0 0 + 2 4.225 3.355 2.906 2 2 2 2 + 3 2.527 2.267 1.680 3 3 3 3 + 4 3.584 1.445 0.595 4 4 4 4 + 5 2.817 4.537 2.405 1 1 1 1 diff --git a/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10006 b/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10006 new file mode 100644 index 00000000..4b822a86 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/res_orig/rt_is.10006 @@ -0,0 +1,6 @@ +5 + 1 2.474 2.326 1.680 3 3 3 3 + 2 3.552 1.521 0.595 4 4 4 4 + 3 2.610 5.580 0.420 0 0 0 0 + 4 4.173 3.421 2.907 2 2 2 2 + 5 2.745 4.581 2.405 1 1 1 1 diff --git a/py_bind/test/testing_fodder/burgers/tmp.addpar b/py_bind/test/testing_fodder/burgers/tmp.addpar new file mode 100755 index 00000000..e2012572 --- /dev/null +++ b/py_bind/test/testing_fodder/burgers/tmp.addpar @@ -0,0 +1 @@ +0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 1.00000000 0.00000000 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/conf.yaml b/py_bind/test/testing_fodder/track/conf.yaml index c2c0272d..28b29a44 100644 --- a/py_bind/test/testing_fodder/track/conf.yaml +++ b/py_bind/test/testing_fodder/track/conf.yaml @@ -37,11 +37,11 @@ correspondences: sequence: targets_template: testing_fodder/track/newpart/cam{cam:1d}. - first: 1 - last: 5 + first: 10001 + last: 10005 tracking: - velocity_lims: [[-15, 15], [-15, 15], [-15, 15]] - angle_lim: 100 - accel_lim: 2 + velocity_lims: [[-1.5, 1.5], [-1.5, 1.5], [-1.5, 1.5]] + angle_lim: 110 + accel_lim: 0.5 add_particle: 1 diff --git a/py_bind/test/testing_fodder/track/newpart/cam1.0000_targets b/py_bind/test/testing_fodder/track/newpart/cam1.0000_targets deleted file mode 100644 index 6e1be319..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam1.0000_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 967.161 590.871 100 10 10 10000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/newpart/cam1.0003_targets b/py_bind/test/testing_fodder/track/newpart/cam1.0003_targets deleted file mode 100644 index afd9f50c..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam1.0003_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 967.8810 590.8690 100 10 10 10000 1 diff --git a/py_bind/test/testing_fodder/track/newpart/cam1.0004_targets b/py_bind/test/testing_fodder/track/newpart/cam1.0004_targets deleted file mode 100644 index a993dce0..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam1.0004_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 968.2400 590.8680 100 10 10 10000 1 diff --git a/py_bind/test/testing_fodder/track/newpart/cam1.0005_targets b/py_bind/test/testing_fodder/track/newpart/cam1.0005_targets deleted file mode 100644 index 8d75c7fa..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam1.0005_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 968.6000 590.8670 100 10 10 10000 2 diff --git a/py_bind/test/testing_fodder/track/newpart/cam1.10000_targets b/py_bind/test/testing_fodder/track/newpart/cam1.10000_targets new file mode 100644 index 00000000..00bae724 --- /dev/null +++ b/py_bind/test/testing_fodder/track/newpart/cam1.10000_targets @@ -0,0 +1,2 @@ +1 + 0 967.161 590.871 100 10 10 10000 0 diff --git a/py_bind/test/testing_fodder/track/newpart/cam1.0001_targets b/py_bind/test/testing_fodder/track/newpart/cam1.10001_targets similarity index 100% rename from py_bind/test/testing_fodder/track/newpart/cam1.0001_targets rename to py_bind/test/testing_fodder/track/newpart/cam1.10001_targets diff --git a/py_bind/test/testing_fodder/track/newpart/cam1.0002_targets b/py_bind/test/testing_fodder/track/newpart/cam1.10002_targets similarity index 100% rename from py_bind/test/testing_fodder/track/newpart/cam1.0002_targets rename to py_bind/test/testing_fodder/track/newpart/cam1.10002_targets diff --git a/py_bind/test/testing_fodder/track/newpart/cam1.10003_targets b/py_bind/test/testing_fodder/track/newpart/cam1.10003_targets new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/py_bind/test/testing_fodder/track/newpart/cam1.10003_targets @@ -0,0 +1 @@ +0 diff --git a/py_bind/test/testing_fodder/track/newpart/cam1.10004_targets b/py_bind/test/testing_fodder/track/newpart/cam1.10004_targets new file mode 100644 index 00000000..4a505587 --- /dev/null +++ b/py_bind/test/testing_fodder/track/newpart/cam1.10004_targets @@ -0,0 +1,2 @@ +1 + 0 968.2400 590.8680 100 10 10 10000 0 diff --git a/py_bind/test/testing_fodder/track/newpart/cam1.10005_targets b/py_bind/test/testing_fodder/track/newpart/cam1.10005_targets new file mode 100644 index 00000000..83e102e1 --- /dev/null +++ b/py_bind/test/testing_fodder/track/newpart/cam1.10005_targets @@ -0,0 +1,2 @@ +1 + 0 968.6000 590.8670 100 10 10 10000 0 diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.0000_targets b/py_bind/test/testing_fodder/track/newpart/cam2.0000_targets deleted file mode 100644 index 053170ba..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam2.0000_targets +++ /dev/null @@ -1 +0,0 @@ -1 0 952.839 590.871 100 10 10 10000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.0003_targets b/py_bind/test/testing_fodder/track/newpart/cam2.0003_targets deleted file mode 100644 index cb75a699..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam2.0003_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 953.5580 590.8730 100 10 10 10000 1 diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.0004_targets b/py_bind/test/testing_fodder/track/newpart/cam2.0004_targets deleted file mode 100644 index 71257884..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam2.0004_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 953.9180 590.8740 100 10 10 10000 1 diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.0005_targets b/py_bind/test/testing_fodder/track/newpart/cam2.0005_targets deleted file mode 100644 index f2351321..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam2.0005_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 954.2780 590.8750 100 10 10 10000 2 diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.1 b/py_bind/test/testing_fodder/track/newpart/cam2.1 deleted file mode 100644 index 71e9ed61..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam2.1 +++ /dev/null @@ -1 +0,0 @@ -1 0 9.528e+02 5.909e+02 100 10 1010000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.10000_targets b/py_bind/test/testing_fodder/track/newpart/cam2.10000_targets new file mode 100644 index 00000000..b19e15dd --- /dev/null +++ b/py_bind/test/testing_fodder/track/newpart/cam2.10000_targets @@ -0,0 +1,2 @@ +1 + 0 952.839 590.871 100 10 10 10000 0 diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.0001_targets b/py_bind/test/testing_fodder/track/newpart/cam2.10001_targets similarity index 100% rename from py_bind/test/testing_fodder/track/newpart/cam2.0001_targets rename to py_bind/test/testing_fodder/track/newpart/cam2.10001_targets diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.0002_targets b/py_bind/test/testing_fodder/track/newpart/cam2.10002_targets similarity index 100% rename from py_bind/test/testing_fodder/track/newpart/cam2.0002_targets rename to py_bind/test/testing_fodder/track/newpart/cam2.10002_targets diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.10003_targets b/py_bind/test/testing_fodder/track/newpart/cam2.10003_targets new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/py_bind/test/testing_fodder/track/newpart/cam2.10003_targets @@ -0,0 +1 @@ +0 diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.10004_targets b/py_bind/test/testing_fodder/track/newpart/cam2.10004_targets new file mode 100644 index 00000000..41b2e8dc --- /dev/null +++ b/py_bind/test/testing_fodder/track/newpart/cam2.10004_targets @@ -0,0 +1,2 @@ +1 + 0 953.9180 590.8740 100 10 10 10000 0 diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.10005_targets b/py_bind/test/testing_fodder/track/newpart/cam2.10005_targets new file mode 100644 index 00000000..d2a78097 --- /dev/null +++ b/py_bind/test/testing_fodder/track/newpart/cam2.10005_targets @@ -0,0 +1,2 @@ +1 + 0 954.2780 590.8750 100 10 10 10000 0 diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.2 b/py_bind/test/testing_fodder/track/newpart/cam2.2 deleted file mode 100644 index 6d34be57..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam2.2 +++ /dev/null @@ -1 +0,0 @@ -1 0 9.532e+02 5.909e+02 100 10 1010000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.3 b/py_bind/test/testing_fodder/track/newpart/cam2.3 deleted file mode 100644 index b019b4c5..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam2.3 +++ /dev/null @@ -1 +0,0 @@ -1 0 9.536e+02 5.909e+02 100 10 1010000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.4 b/py_bind/test/testing_fodder/track/newpart/cam2.4 deleted file mode 100644 index 47dd62bb..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam2.4 +++ /dev/null @@ -1 +0,0 @@ -1 0 9.539e+02 5.909e+02 100 10 1010000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/newpart/cam2.5 b/py_bind/test/testing_fodder/track/newpart/cam2.5 deleted file mode 100644 index 942cf224..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam2.5 +++ /dev/null @@ -1 +0,0 @@ -1 0 9.543e+02 5.909e+02 100 10 1010000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.0000_targets b/py_bind/test/testing_fodder/track/newpart/cam3.0000_targets deleted file mode 100644 index ae8c02af..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam3.0000_targets +++ /dev/null @@ -1 +0,0 @@ -1 0 2362.210 591.025 100 10 10 10000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.0003_targets b/py_bind/test/testing_fodder/track/newpart/cam3.0003_targets deleted file mode 100644 index 824de238..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam3.0003_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 955.7830 590.8730 100 10 10 10000 1 diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.0004_targets b/py_bind/test/testing_fodder/track/newpart/cam3.0004_targets deleted file mode 100644 index d27790a5..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam3.0004_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 955.4230 590.8740 100 10 10 10000 1 diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.0005_targets b/py_bind/test/testing_fodder/track/newpart/cam3.0005_targets deleted file mode 100644 index cde598ba..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam3.0005_targets +++ /dev/null @@ -1,2 +0,0 @@ -1 - 0 955.0630 590.8750 100 10 10 10000 2 diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.1 b/py_bind/test/testing_fodder/track/newpart/cam3.1 deleted file mode 100644 index 0954c3a3..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam3.1 +++ /dev/null @@ -1 +0,0 @@ -1 0 2.362e+03 5.910e+02 100 10 1010000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.10000_targets b/py_bind/test/testing_fodder/track/newpart/cam3.10000_targets new file mode 100644 index 00000000..9bd0364e --- /dev/null +++ b/py_bind/test/testing_fodder/track/newpart/cam3.10000_targets @@ -0,0 +1,2 @@ +1 + 0 2362.210 591.025 100 10 10 10000 0 diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.0001_targets b/py_bind/test/testing_fodder/track/newpart/cam3.10001_targets similarity index 100% rename from py_bind/test/testing_fodder/track/newpart/cam3.0001_targets rename to py_bind/test/testing_fodder/track/newpart/cam3.10001_targets diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.0002_targets b/py_bind/test/testing_fodder/track/newpart/cam3.10002_targets similarity index 100% rename from py_bind/test/testing_fodder/track/newpart/cam3.0002_targets rename to py_bind/test/testing_fodder/track/newpart/cam3.10002_targets diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.10003_targets b/py_bind/test/testing_fodder/track/newpart/cam3.10003_targets new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/py_bind/test/testing_fodder/track/newpart/cam3.10003_targets @@ -0,0 +1 @@ +0 diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.10004_targets b/py_bind/test/testing_fodder/track/newpart/cam3.10004_targets new file mode 100644 index 00000000..fdaa0479 --- /dev/null +++ b/py_bind/test/testing_fodder/track/newpart/cam3.10004_targets @@ -0,0 +1,2 @@ +1 + 0 955.4230 590.8740 100 10 10 10000 0 diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.10005_targets b/py_bind/test/testing_fodder/track/newpart/cam3.10005_targets new file mode 100644 index 00000000..2cde9f59 --- /dev/null +++ b/py_bind/test/testing_fodder/track/newpart/cam3.10005_targets @@ -0,0 +1,2 @@ +1 + 0 955.0630 590.8750 100 10 10 10000 0 diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.2 b/py_bind/test/testing_fodder/track/newpart/cam3.2 deleted file mode 100644 index 0954c3a3..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam3.2 +++ /dev/null @@ -1 +0,0 @@ -1 0 2.362e+03 5.910e+02 100 10 1010000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.3 b/py_bind/test/testing_fodder/track/newpart/cam3.3 deleted file mode 100644 index afd8e995..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam3.3 +++ /dev/null @@ -1 +0,0 @@ -1 0 2.361e+03 5.910e+02 100 10 1010000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.4 b/py_bind/test/testing_fodder/track/newpart/cam3.4 deleted file mode 100644 index afd8e995..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam3.4 +++ /dev/null @@ -1 +0,0 @@ -1 0 2.361e+03 5.910e+02 100 10 1010000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/newpart/cam3.5 b/py_bind/test/testing_fodder/track/newpart/cam3.5 deleted file mode 100644 index afd8e995..00000000 --- a/py_bind/test/testing_fodder/track/newpart/cam3.5 +++ /dev/null @@ -1 +0,0 @@ -1 0 2.361e+03 5.910e+02 100 10 1010000 0 \ No newline at end of file diff --git a/py_bind/test/testing_fodder/track/res_orig/particles.1 b/py_bind/test/testing_fodder/track/res_orig/particles.10001 similarity index 100% rename from py_bind/test/testing_fodder/track/res_orig/particles.1 rename to py_bind/test/testing_fodder/track/res_orig/particles.10001 diff --git a/py_bind/test/testing_fodder/track/res_orig/particles.2 b/py_bind/test/testing_fodder/track/res_orig/particles.10002 similarity index 100% rename from py_bind/test/testing_fodder/track/res_orig/particles.2 rename to py_bind/test/testing_fodder/track/res_orig/particles.10002 diff --git a/py_bind/test/testing_fodder/track/res_orig/particles.10003 b/py_bind/test/testing_fodder/track/res_orig/particles.10003 new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/py_bind/test/testing_fodder/track/res_orig/particles.10003 @@ -0,0 +1 @@ +0 diff --git a/py_bind/test/testing_fodder/track/res_orig/particles.4 b/py_bind/test/testing_fodder/track/res_orig/particles.10004 similarity index 100% rename from py_bind/test/testing_fodder/track/res_orig/particles.4 rename to py_bind/test/testing_fodder/track/res_orig/particles.10004 diff --git a/py_bind/test/testing_fodder/track/res_orig/particles.5 b/py_bind/test/testing_fodder/track/res_orig/particles.10005 similarity index 100% rename from py_bind/test/testing_fodder/track/res_orig/particles.5 rename to py_bind/test/testing_fodder/track/res_orig/particles.10005 diff --git a/py_bind/test/testing_fodder/track/res_orig/particles.3 b/py_bind/test/testing_fodder/track/res_orig/particles.3 deleted file mode 100644 index e546fc9b..00000000 --- a/py_bind/test/testing_fodder/track/res_orig/particles.3 +++ /dev/null @@ -1,2 +0,0 @@ -1 - 1 0.020 0.000 0.000 0 0 0 0