diff options
Diffstat (limited to 'SD-VBS/benchmarks/localization')
-rw-r--r-- | SD-VBS/benchmarks/localization/data/cif/12345.txt | 15 | ||||
-rw-r--r-- | SD-VBS/benchmarks/localization/data/vga/12345.txt | 5 | ||||
-rw-r--r-- | SD-VBS/benchmarks/localization/src/c/script_localization.c | 20 |
3 files changed, 8 insertions, 32 deletions
diff --git a/SD-VBS/benchmarks/localization/data/cif/12345.txt b/SD-VBS/benchmarks/localization/data/cif/12345.txt deleted file mode 100644 index 3db1af2..0000000 --- a/SD-VBS/benchmarks/localization/data/cif/12345.txt +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | localization-cif none 9 none 5 48076352 12345 0 0 0 | ||
2 | localization-cif none 9 none 5 43361112 12345 1 0 0 | ||
3 | localization-cif none 9 none 5 43366440 12345 2 0 0 | ||
4 | localization-cif none 9 none 5 43370196 12345 3 0 0 | ||
5 | localization-cif none 9 none 5 43342796 12345 4 0 0 | ||
6 | localization-cif none 9 none 5 49304636 12345 0 0 0 | ||
7 | localization-cif none 9 none 5 43263656 12345 1 0 0 | ||
8 | localization-cif none 9 none 5 43311788 12345 2 0 0 | ||
9 | localization-cif none 9 none 5 45305660 12345 3 0 0 | ||
10 | localization-cif none 9 none 5 45991472 12345 4 0 0 | ||
11 | localization-cif none 13 none 5 50834232 12345 0 0 0 | ||
12 | localization-cif none 13 none 5 45950604 12345 1 0 0 | ||
13 | localization-cif none 13 none 5 45906792 12345 2 0 0 | ||
14 | localization-cif none 13 none 5 45996860 12345 3 0 0 | ||
15 | localization-cif none 13 none 5 52359620 12345 4 0 0 | ||
diff --git a/SD-VBS/benchmarks/localization/data/vga/12345.txt b/SD-VBS/benchmarks/localization/data/vga/12345.txt deleted file mode 100644 index af25656..0000000 --- a/SD-VBS/benchmarks/localization/data/vga/12345.txt +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | localization-vga none 29 none 5 162689456 12345 0 0 0 | ||
2 | localization-vga none 29 none 5 152758336 12345 1 0 0 | ||
3 | localization-vga none 29 none 5 152857504 12345 2 0 0 | ||
4 | localization-vga none 29 none 5 152713328 12345 3 0 0 | ||
5 | localization-vga none 29 none 5 152901152 12345 4 0 0 | ||
diff --git a/SD-VBS/benchmarks/localization/src/c/script_localization.c b/SD-VBS/benchmarks/localization/src/c/script_localization.c index 3392320..ed37132 100644 --- a/SD-VBS/benchmarks/localization/src/c/script_localization.c +++ b/SD-VBS/benchmarks/localization/src/c/script_localization.c | |||
@@ -41,7 +41,6 @@ int main(int argc, char* argv[]) | |||
41 | 41 | ||
42 | char im1[100]; | 42 | char im1[100]; |
43 | 43 | ||
44 | printf("Input txt File: "); | ||
45 | scanf("%s", im1); | 44 | scanf("%s", im1); |
46 | 45 | ||
47 | fid = readFile(im1); | 46 | fid = readFile(im1); |
@@ -83,11 +82,10 @@ int main(int argc, char* argv[]) | |||
83 | F2D *randn; | 82 | F2D *randn; |
84 | 83 | ||
85 | randn = randWrapper(n,3); | 84 | randn = randWrapper(n,3); |
86 | printf("start\n"); | 85 | for_each_job { |
87 | for_each_job{ | 86 | fResetArray(pos,n, 3, 0); |
88 | fResetArray(pos,n, 3, 0); | 87 | fResetArray(vel,n, 3, 0); |
89 | fResetArray(vel,n, 3, 0); | 88 | fResetArray(ones,n,1,1); |
90 | fResetArray(ones,n,1,1); | ||
91 | 89 | ||
92 | { | 90 | { |
93 | int j; | 91 | int j; |
@@ -95,7 +93,7 @@ int main(int argc, char* argv[]) | |||
95 | for(j=0; j<3; j++) | 93 | for(j=0; j<3; j++) |
96 | subsref(vel, i, j) += subsref(randn,i,j) * STDDEV_ODOVel; | 94 | subsref(vel, i, j) += subsref(randn,i,j) * STDDEV_ODOVel; |
97 | 95 | ||
98 | } | 96 | } |
99 | 97 | ||
100 | 98 | ||
101 | 99 | ||
@@ -486,17 +484,15 @@ int main(int argc, char* argv[]) | |||
486 | subsref(resultMat,1,icount) = velOut; | 484 | subsref(resultMat,1,icount) = velOut; |
487 | subsref(resultMat,2,icount) = posOut; | 485 | subsref(resultMat,2,icount) = posOut; |
488 | } | 486 | } |
489 | 487 | ||
490 | fFreeHandle(sData); | 488 | fFreeHandle(sData); |
491 | 489 | ||
492 | |||
493 | if (asubsref(isEOF,0) == 1) | 490 | if (asubsref(isEOF,0) == 1) |
494 | break; | 491 | break; |
495 | } | 492 | } |
496 | } | 493 | } |
497 | printf("end..\n"); | ||
498 | 494 | ||
499 | #ifdef CHECK | 495 | #ifdef CHECK |
500 | 496 | ||
501 | // Self checking - use expected.txt from data directory | 497 | // Self checking - use expected.txt from data directory |
502 | { | 498 | { |