diff options
| author | Thomas Knudsen <busstoptaktik@users.noreply.github.com> | 2017-10-20 13:10:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 13:10:28 +0200 |
| commit | 81bf085dce5ce6eac59835cd45dba6aecdb1a8e6 (patch) | |
| tree | 4a1cd0a8c25cd6161c7ab9767fdbcbebd35216c3 | |
| parent | 33c3549fa7a26d86388520c91b7f0fa38d51bfa1 (diff) | |
| download | PROJ-81bf085dce5ce6eac59835cd45dba6aecdb1a8e6.tar.gz PROJ-81bf085dce5ce6eac59835cd45dba6aecdb1a8e6.zip | |
Remove superfluous internal selftests from projection files matching patterns PJ_d....c and PJ_e....c (#615)
| -rw-r--r-- | src/PJ_denoy.c | 29 | ||||
| -rw-r--r-- | src/PJ_eck1.c | 43 | ||||
| -rw-r--r-- | src/PJ_eck2.c | 44 | ||||
| -rw-r--r-- | src/PJ_eck3.c | 180 | ||||
| -rw-r--r-- | src/PJ_eck4.c | 44 | ||||
| -rw-r--r-- | src/PJ_eck5.c | 44 | ||||
| -rw-r--r-- | src/PJ_eqc.c | 44 | ||||
| -rw-r--r-- | src/PJ_eqdc.c | 59 |
8 files changed, 11 insertions, 476 deletions
diff --git a/src/PJ_denoy.c b/src/PJ_denoy.c index 3964c7da..aec78b40 100644 --- a/src/PJ_denoy.c +++ b/src/PJ_denoy.c @@ -29,31 +29,4 @@ PJ *PROJECTION(denoy) { return P; } -#ifndef PJ_SELFTEST -int pj_denoy_selftest (void) {return 0;} -#else - -int pj_denoy_selftest (void) { - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=denoy +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 223377.422876954137, 111701.07212763709}, - { 223377.422876954137, -111701.07212763709}, - {-223377.422876954137, 111701.07212763709}, - {-223377.422876954137, -111701.07212763709}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, 0, 4, 4, fwd_in, 0, s_fwd_expect, 0, 0, 0); -} - - -#endif +int pj_denoy_selftest (void) {return 10000;} diff --git a/src/PJ_eck1.c b/src/PJ_eck1.c index bd5c1916..10fef421 100644 --- a/src/PJ_eck1.c +++ b/src/PJ_eck1.c @@ -39,45 +39,4 @@ PJ *PROJECTION(eck1) { } -#ifndef PJ_SELFTEST -int pj_eck1_selftest (void) {return 0;} -#else - -int pj_eck1_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=eck1 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - XY s_fwd_expect[] = { - { 204680.88820295094, 102912.17842606473}, - { 204680.88820295094, -102912.17842606473}, - {-204680.88820295094, 102912.17842606473}, - {-204680.88820295094, -102912.17842606473}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.0019434150820034624, 0.00097170229538813102}, - { 0.0019434150820034624, -0.00097170229538813102}, - {-0.0019434150820034624, 0.00097170229538813102}, - {-0.0019434150820034624, -0.00097170229538813102}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, inv_in, 0, s_inv_expect); -} - - -#endif +int pj_eck1_selftest (void) {return 10000;} diff --git a/src/PJ_eck2.c b/src/PJ_eck2.c index 3b2e4e49..f8adcc7a 100644 --- a/src/PJ_eck2.c +++ b/src/PJ_eck2.c @@ -53,46 +53,4 @@ PJ *PROJECTION(eck2) { } -#ifndef PJ_SELFTEST -int pj_eck2_selftest (void) {return 0;} -#else - -int pj_eck2_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=eck2 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 204472.87090796008, 121633.73497524235}, - { 204472.87090796008, -121633.73497524235}, - {-204472.87090796008, 121633.73497524235}, - {-204472.87090796008, -121633.73497524235}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.0019434150820034624, 0.00082480429919795412}, - { 0.0019434150820034624, -0.00082480429919795412}, - {-0.0019434150820034624, 0.00082480429919795412}, - {-0.0019434150820034624, -0.00082480429919795412}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, inv_in, 0, s_inv_expect); -} - - -#endif +int pj_eck2_selftest (void) {return 10000;} diff --git a/src/PJ_eck3.c b/src/PJ_eck3.c index 8dc72c7c..3e64e050 100644 --- a/src/PJ_eck3.c +++ b/src/PJ_eck3.c @@ -107,179 +107,7 @@ PJ *PROJECTION(putp1) { } -#ifndef PJ_SELFTEST -int pj_eck3_selftest (void) {return 0;} -#else - -int pj_eck3_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=eck3 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 188652.01572153764, 94328.919337031271}, - { 188652.01572153764, -94328.919337031271}, - {-188652.01572153764, 94328.919337031271}, - {-188652.01572153764, -94328.919337031271}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.0021202405520236059, 0.0010601202759750307}, - { 0.0021202405520236059, -0.0010601202759750307}, - {-0.0021202405520236059, 0.0010601202759750307}, - {-0.0021202405520236059, -0.0010601202759750307}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, inv_in, 0, s_inv_expect); -} - - -#endif - -#ifndef PJ_SELFTEST -int pj_kav7_selftest (void) {return 0;} -#else - -int pj_kav7_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=kav7 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 193462.9749437288, 111701.07212763709}, - { 193462.9749437288, -111701.07212763709}, - {-193462.9749437288, 111701.07212763709}, - {-193462.9749437288, -111701.07212763709} - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.0020674833579085268, 0.00089524655489191132}, - { 0.0020674833579085268, -0.00089524655489191132}, - {-0.0020674833579085268, 0.00089524655489191132}, - {-0.0020674833579085268, -0.00089524655489191132} - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, inv_in, 0, s_inv_expect); -} - - -#endif - -#ifndef PJ_SELFTEST -int pj_wag6_selftest (void) {return 0;} -#else - -int pj_wag6_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=wag6 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 211652.56216440981, 105831.18078732977}, - { 211652.56216440981, -105831.18078732977}, - {-211652.56216440981, 105831.18078732977}, - {-211652.56216440981, -105831.18078732977} - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.0018898022163257513, 0.000944901108123818}, - { 0.0018898022163257513, -0.000944901108123818}, - {-0.0018898022163257513, 0.000944901108123818}, - {-0.0018898022163257513, -0.000944901108123818} - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, inv_in, 0, s_inv_expect); -} - - -#endif - - -#ifndef PJ_SELFTEST -int pj_putp1_selftest (void) {return 0;} -#else - -int pj_putp1_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=putp1 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 211642.76275416015, 105831.18078732977}, - { 211642.76275416015, -105831.18078732977}, - {-211642.76275416015, 105831.18078732977}, - {-211642.76275416015, -105831.18078732977} - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.0018898022164038663, 0.000944901108123818}, - { 0.0018898022164038663, -0.000944901108123818}, - {-0.0018898022164038663, 0.000944901108123818}, - {-0.0018898022164038663, -0.000944901108123818} - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, inv_in, 0, s_inv_expect); -} - - -#endif +int pj_eck3_selftest (void) {return 10000;} +int pj_kav7_selftest (void) {return 10000;} +int pj_wag6_selftest (void) {return 10000;} +int pj_putp1_selftest (void) {return 10000;} diff --git a/src/PJ_eck4.c b/src/PJ_eck4.c index 0ad9ec43..8c323656 100644 --- a/src/PJ_eck4.c +++ b/src/PJ_eck4.c @@ -60,46 +60,4 @@ PJ *PROJECTION(eck4) { } -#ifndef PJ_SELFTEST -int pj_eck4_selftest (void) {return 0;} -#else - -int pj_eck4_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=eck4 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 188646.38935641639, 132268.54017406539}, - { 188646.38935641639, -132268.54017406539}, - {-188646.38935641639, 132268.54017406539}, - {-188646.38935641639, -132268.54017406539}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.0021202405520236059, 0.00075601458836610643}, - { 0.0021202405520236059, -0.00075601458836610643}, - {-0.0021202405520236059, 0.00075601458836610643}, - {-0.0021202405520236059, -0.00075601458836610643}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, inv_in, 0, s_inv_expect); -} - - -#endif +int pj_eck4_selftest (void) {return 10000;} diff --git a/src/PJ_eck5.c b/src/PJ_eck5.c index 13617c1d..69e83eda 100644 --- a/src/PJ_eck5.c +++ b/src/PJ_eck5.c @@ -36,46 +36,4 @@ PJ *PROJECTION(eck5) { return P; } -#ifndef PJ_SELFTEST -int pj_eck5_selftest (void) {return 0;} -#else - -int pj_eck5_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=eck5 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 197031.39213406085, 98523.198847226551}, - { 197031.39213406085, -98523.198847226551}, - {-197031.39213406085, 98523.198847226551}, - {-197031.39213406085, -98523.198847226551}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - {0.002029978749734037, 0.001014989374787388}, - {0.002029978749734037, -0.001014989374787388}, - {-0.002029978749734037, 0.001014989374787388}, - {-0.002029978749734037, -0.001014989374787388}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, inv_in, 0, s_inv_expect); -} - - -#endif +int pj_eck5_selftest (void) {return 10000;} diff --git a/src/PJ_eqc.c b/src/PJ_eqc.c index 4f471df1..2b69788f 100644 --- a/src/PJ_eqc.c +++ b/src/PJ_eqc.c @@ -49,46 +49,4 @@ PJ *PROJECTION(eqc) { } -#ifndef PJ_SELFTEST -int pj_eqc_selftest (void) {return 0;} -#else - -int pj_eqc_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=eqc +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 223402.144255274179, 111701.07212763709}, - { 223402.144255274179, -111701.07212763709}, - {-223402.144255274179, 111701.07212763709}, - {-223402.144255274179, -111701.07212763709}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.00179049310978382265, 0.000895246554891911323}, - { 0.00179049310978382265, -0.000895246554891911323}, - {-0.00179049310978382265, 0.000895246554891911323}, - {-0.00179049310978382265, -0.000895246554891911323}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, inv_in, 0, s_inv_expect); -} - - -#endif +int pj_eqc_selftest (void) {return 10000;} diff --git a/src/PJ_eqdc.c b/src/PJ_eqdc.c index cb7e7f10..6e9d2c75 100644 --- a/src/PJ_eqdc.c +++ b/src/PJ_eqdc.c @@ -130,61 +130,4 @@ PJ *PROJECTION(eqdc) { } -#ifndef PJ_SELFTEST -int pj_eqdc_selftest (void) {return 0;} -#else - -int pj_eqdc_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char e_args[] = {"+proj=eqdc +ellps=GRS80 +lat_1=0.5 +lat_2=2"}; - char s_args[] = {"+proj=eqdc +R=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY e_fwd_expect[] = { - { 222588.440269285755, 110659.134907347048}, - { 222756.836702042434, -110489.578087220681}, - {-222588.440269285755, 110659.134907347048}, - {-222756.836702042434, -110489.578087220681}, - }; - - XY s_fwd_expect[] = { - { 223351.088175113517, 111786.108747173785}, - { 223521.200266735133, -111615.970741240744}, - {-223351.088175113517, 111786.108747173785}, - {-223521.200266735133, -111615.970741240744}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP e_inv_expect[] = { - { 0.00179635944879094839, 0.000904368858588402644}, - { 0.00179635822020772734, -0.000904370095529954975}, - {-0.00179635944879094839, 0.000904368858588402644}, - {-0.00179635822020772734, -0.000904370095529954975}, - }; - - LP s_inv_expect[] = { - { 0.0017902210900486641, 0.000895245944814909169}, - { 0.00179021986984890255, -0.000895247165333684842}, - {-0.0017902210900486641, 0.000895245944814909169}, - {-0.00179021986984890255, -0.000895247165333684842}, - }; - - return pj_generic_selftest (e_args, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, e_fwd_expect, s_fwd_expect, inv_in, e_inv_expect, s_inv_expect); -} - - -#endif +int pj_eqdc_selftest (void) {return 10000;} |
