From 780613cccfde5e9f70850b6b026d310e0003d05b Mon Sep 17 00:00:00 2001 From: Thomas Knudsen Date: Sun, 12 Nov 2017 07:03:27 +0100 Subject: Remove selftests from projection files starting with v,w --- src/PJ_vandg.c | 44 +---------------------------------------- src/PJ_vandg2.c | 61 ++------------------------------------------------------- src/PJ_vandg4.c | 32 ++---------------------------- src/PJ_wag2.c | 46 ++----------------------------------------- src/PJ_wag3.c | 46 ++----------------------------------------- src/PJ_wag7.c | 30 ++-------------------------- src/PJ_wink1.c | 46 ++----------------------------------------- src/PJ_wink2.c | 30 ++-------------------------- 8 files changed, 15 insertions(+), 320 deletions(-) (limited to 'src') diff --git a/src/PJ_vandg.c b/src/PJ_vandg.c index e19d01b8..69c7e55c 100644 --- a/src/PJ_vandg.c +++ b/src/PJ_vandg.c @@ -106,46 +106,4 @@ PJ *PROJECTION(vandg) { } -#ifndef PJ_SELFTEST -int pj_vandg_selftest (void) {return 0;} -#else - -int pj_vandg_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=vandg +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 223395.24954340671, 111704.59663367498}, - { 223395.24954340671, -111704.59663367498}, - {-223395.24954340671, 111704.59663367498}, - {-223395.24954340671, -111704.59663367498}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.001790493715929761, 0.00089524655486993867}, - { 0.001790493715929761, -0.00089524655486993867}, - {-0.001790493715929761, 0.00089524655486993867}, - {-0.001790493715929761, -0.00089524655486993867}, - }; - - 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_vandg_selftest (void) {return 10000;} diff --git a/src/PJ_vandg2.c b/src/PJ_vandg2.c index 3f11e289..b6b69183 100644 --- a/src/PJ_vandg2.c +++ b/src/PJ_vandg2.c @@ -71,62 +71,5 @@ PJ *PROJECTION(vandg3) { } -#ifndef PJ_SELFTEST -int pj_vandg2_selftest (void) {return 0;} -#else - -int pj_vandg2_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=vandg2 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 223395.24785043663, 111718.49103722633}, - { 223395.24785043663, -111718.49103722633}, - {-223395.24785043663, 111718.49103722633}, - {-223395.24785043663, -111718.49103722633}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, 0, 0, 0); -} - - -#endif - -#ifndef PJ_SELFTEST -int pj_vandg3_selftest (void) {return 0;} -#else - -int pj_vandg3_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=vandg3 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 223395.24955283134, 111704.51990442065}, - { 223395.24955283134, -111704.51990442065}, - {-223395.24955283134, 111704.51990442065}, - {-223395.24955283134, -111704.51990442065}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, 0, 0, 0); -} - - -#endif +int pj_vandg2_selftest (void) {return 10000;} +int pj_vandg3_selftest (void) {return 10000;} diff --git a/src/PJ_vandg4.c b/src/PJ_vandg4.c index f7f48b43..de525810 100644 --- a/src/PJ_vandg4.c +++ b/src/PJ_vandg4.c @@ -1,5 +1,5 @@ #define PJ_LIB__ -#include +#include "projects.h" PROJ_HEAD(vandg4, "van der Grinten IV") "\n\tMisc Sph, no inv."; @@ -52,32 +52,4 @@ PJ *PROJECTION(vandg4) { } -#ifndef PJ_SELFTEST -int pj_vandg4_selftest (void) {return 0;} -#else - -int pj_vandg4_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=vandg4 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 223374.57729435508, 111701.19548415358 }, - { 223374.57729435508, -111701.19548415358 }, - {-223374.57729435508, 111701.19548415358 }, - {-223374.57729435508, -111701.19548415358 }, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, 0, 0, 0); -} - - -#endif +int pj_vandg4_selftest (void) {return 10000;} diff --git a/src/PJ_wag2.c b/src/PJ_wag2.c index 0588167e..14d8f1c4 100644 --- a/src/PJ_wag2.c +++ b/src/PJ_wag2.c @@ -1,5 +1,5 @@ #define PJ_LIB__ -# include +#include "projects.h" PROJ_HEAD(wag2, "Wagner II") "\n\tPCyl., Sph."; #define C_x 0.92483 #define C_y 1.38725 @@ -33,46 +33,4 @@ PJ *PROJECTION(wag2) { } -#ifndef PJ_SELFTEST -int pj_wag2_selftest (void) {return 0;} -#else - -int pj_wag2_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=wag2 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 206589.88809996162, 120778.04035754716}, - { 206589.88809996162, -120778.04035754716}, - {-206589.88809996162, 120778.04035754716}, - {-206589.88809996162, -120778.04035754716}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.0019360240367390709, 0.00082795765763814082}, - { 0.0019360240367390709, -0.00082795765763814082}, - {-0.0019360240367390709, 0.00082795765763814082}, - {-0.0019360240367390709, -0.00082795765763814082}, - }; - - 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_wag2_selftest (void) {return 10000;} diff --git a/src/PJ_wag3.c b/src/PJ_wag3.c index 7f300add..09a9291d 100644 --- a/src/PJ_wag3.c +++ b/src/PJ_wag3.c @@ -1,5 +1,5 @@ #define PJ_LIB__ -#include +#include "projects.h" #include PROJ_HEAD(wag3, "Wagner III") "\n\tPCyl., Sph.\n\tlat_ts="; @@ -45,46 +45,4 @@ PJ *PROJECTION(wag3) { } -#ifndef PJ_SELFTEST -int pj_wag3_selftest (void) {return 0;} -#else - -int pj_wag3_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=wag3 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - {223387.02171816575, 111701.07212763709}, - {223387.02171816575, -111701.07212763709}, - {-223387.02171816575, 111701.07212763709}, - {-223387.02171816575, -111701.07212763709}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - {0.001790493109880963, 0.00089524655489191132}, - {0.001790493109880963, -0.00089524655489191132}, - {-0.001790493109880963, 0.00089524655489191132}, - {-0.001790493109880963, -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 +int pj_wag3_selftest (void) {return 10000;} diff --git a/src/PJ_wag7.c b/src/PJ_wag7.c index 9152fdea..55c43534 100644 --- a/src/PJ_wag7.c +++ b/src/PJ_wag7.c @@ -1,5 +1,5 @@ #define PJ_LIB__ -#include +#include "projects.h" PROJ_HEAD(wag7, "Wagner VII") "\n\tMisc Sph, no inv."; @@ -27,30 +27,4 @@ PJ *PROJECTION(wag7) { } -#ifndef PJ_SELFTEST -int pj_wag7_selftest (void) {return 0;} -#else - -int pj_wag7_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=wag7 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 198601.87695731167, 125637.0457141714}, - { 198601.87695731167, -125637.0457141714}, - {-198601.87695731167, 125637.0457141714}, - {-198601.87695731167, -125637.0457141714}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, 0, 0, 0); -} -#endif +int pj_wag7_selftest (void) {return 10000;} diff --git a/src/PJ_wink1.c b/src/PJ_wink1.c index c1e2e909..670ff0f6 100644 --- a/src/PJ_wink1.c +++ b/src/PJ_wink1.c @@ -1,5 +1,5 @@ #define PJ_LIB__ -#include +#include "projects.h" #include PROJ_HEAD(wink1, "Winkel I") "\n\tPCyl., Sph.\n\tlat_ts="; @@ -41,46 +41,4 @@ PJ *PROJECTION(wink1) { } -#ifndef PJ_SELFTEST -int pj_wink1_selftest (void) {return 0;} -#else - -int pj_wink1_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=wink1 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 223385.13164095284, 111701.07212763709}, - { 223385.13164095284, -111701.07212763709}, - {-223385.13164095284, 111701.07212763709}, - {-223385.13164095284, -111701.07212763709}, - }; - - XY inv_in[] = { - { 200, 100}, - { 200,-100}, - {-200, 100}, - {-200,-100} - }; - - LP s_inv_expect[] = { - { 0.0017904931098931057, 0.00089524655489191132}, - { 0.0017904931098931057, -0.00089524655489191132}, - {-0.0017904931098931057, 0.00089524655489191132}, - {-0.0017904931098931057, -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 +int pj_wink1_selftest (void) {return 10000;} diff --git a/src/PJ_wink2.c b/src/PJ_wink2.c index 43b6cfce..512354bb 100644 --- a/src/PJ_wink2.c +++ b/src/PJ_wink2.c @@ -1,5 +1,5 @@ #define PJ_LIB__ -# include +#include "projects.h" #include PROJ_HEAD(wink2, "Winkel II") "\n\tPCyl., Sph., no inv.\n\tlat_1="; @@ -49,30 +49,4 @@ PJ *PROJECTION(wink2) { } -#ifndef PJ_SELFTEST -int pj_wink2_selftest (void) {return 0;} -#else - -int pj_wink2_selftest (void) { - double tolerance_lp = 1e-10; - double tolerance_xy = 1e-7; - - char s_args[] = {"+proj=wink2 +a=6400000 +lat_1=0.5 +lat_2=2"}; - - LP fwd_in[] = { - { 2, 1}, - { 2,-1}, - {-2, 1}, - {-2,-1} - }; - - XY s_fwd_expect[] = { - { 223387.39643378611, 124752.03279744535}, - { 223387.39643378611, -124752.03279744535}, - {-223387.39643378611, 124752.03279744535}, - {-223387.39643378611, -124752.03279744535}, - }; - - return pj_generic_selftest (0, s_args, tolerance_xy, tolerance_lp, 4, 4, fwd_in, 0, s_fwd_expect, 0, 0, 0); -} -#endif +int pj_wink2_selftest (void) {return 10000;} -- cgit v1.2.3