aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Knudsen <thokn@sdfe.dk>2017-10-25 20:46:56 +0200
committerThomas Knudsen <thokn@sdfe.dk>2017-10-25 20:46:56 +0200
commit076247ec39e8ad1ce9554744b8c65b26f43b2017 (patch)
tree348c698742b2709e3df11f7ddfb859ba4473526a
parenta15c64a4f82a9996ee2d6a21de902f6bc80dc4ac (diff)
downloadPROJ-076247ec39e8ad1ce9554744b8c65b26f43b2017.tar.gz
PROJ-076247ec39e8ad1ce9554744b8c65b26f43b2017.zip
Remove superfluous internal selftests from projection files matching patterns PJ_f....c and PJ_e....c
-rw-r--r--src/PJ_fahey.c44
-rw-r--r--src/PJ_fouc_s.c44
-rw-r--r--src/PJ_gall.c44
-rw-r--r--src/PJ_geos.c59
-rw-r--r--src/PJ_gins8.c30
-rw-r--r--src/PJ_gn_sinu.c197
-rw-r--r--src/PJ_gnom.c44
-rw-r--r--src/PJ_goode.c46
-rw-r--r--src/PJ_gstmerc.c45
9 files changed, 14 insertions, 539 deletions
diff --git a/src/PJ_fahey.c b/src/PJ_fahey.c
index 42318f8f..4fcb7849 100644
--- a/src/PJ_fahey.c
+++ b/src/PJ_fahey.c
@@ -37,46 +37,4 @@ PJ *PROJECTION(fahey) {
return P;
}
-#ifndef PJ_SELFTEST
-int pj_fahey_selftest (void) {return 0;}
-#else
-
-int pj_fahey_selftest (void) {
- double tolerance_lp = 1e-10;
- double tolerance_xy = 1e-7;
-
- char s_args[] = {"+proj=fahey +a=6400000 +lat_1=0.5 +lat_2=2"};
-
- LP fwd_in[] = {
- { 2, 1},
- { 2,-1},
- {-2, 1},
- {-2,-1}
- };
-
- XY s_fwd_expect[] = {
- { 182993.34464912376, 101603.19356988439},
- { 182993.34464912376, -101603.19356988439},
- {-182993.34464912376, 101603.19356988439},
- {-182993.34464912376, -101603.19356988439},
- };
-
- XY inv_in[] = {
- { 200, 100},
- { 200,-100},
- {-200, 100},
- {-200,-100}
- };
-
- LP s_inv_expect[] = {
- {0.0021857886080359551, 0.00098424601668238403},
- {0.0021857886080359551, -0.00098424601668238403},
- {-0.0021857886080359551, 0.00098424601668238403},
- {-0.0021857886080359551, -0.00098424601668238403},
- };
-
- 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_fahey_selftest (void) {return 10000;}
diff --git a/src/PJ_fouc_s.c b/src/PJ_fouc_s.c
index 343e5878..c581e690 100644
--- a/src/PJ_fouc_s.c
+++ b/src/PJ_fouc_s.c
@@ -67,46 +67,4 @@ PJ *PROJECTION(fouc_s) {
}
-#ifndef PJ_SELFTEST
-int pj_fouc_s_selftest (void) {return 0;}
-#else
-
-int pj_fouc_s_selftest (void) {
- double tolerance_lp = 1e-10;
- double tolerance_xy = 1e-7;
-
- char s_args[] = {"+proj=fouc_s +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.14425527424, 111695.40119861449},
- { 223402.14425527424, -111695.40119861449},
- {-223402.14425527424, 111695.40119861449},
- {-223402.14425527424, -111695.40119861449},
- };
-
- XY inv_in[] = {
- { 200, 100},
- { 200,-100},
- {-200, 100},
- {-200,-100}
- };
-
- LP s_inv_expect[] = {
- { 0.0017904931097838226, 0.000895246554928339},
- { 0.0017904931097838226, -0.000895246554928339},
- {-0.0017904931097838226, 0.000895246554928339},
- {-0.0017904931097838226, -0.000895246554928339},
- };
-
- 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_fouc_s_selftest (void) {return 10000;}
diff --git a/src/PJ_gall.c b/src/PJ_gall.c
index 01a56e33..8a003073 100644
--- a/src/PJ_gall.c
+++ b/src/PJ_gall.c
@@ -41,46 +41,4 @@ PJ *PROJECTION(gall) {
}
-#ifndef PJ_SELFTEST
-int pj_gall_selftest (void) {return 0;}
-#else
-
-int pj_gall_selftest (void) {
- double tolerance_lp = 1e-10;
- double tolerance_xy = 1e-7;
-
- char s_args[] = {"+proj=gall +a=6400000 +lat_1=0.5 +lat_2=2"};
-
- LP fwd_in[] = {
- { 2, 1},
- { 2,-1},
- {-2, 1},
- {-2,-1}
- };
-
- XY s_fwd_expect[] = {
- { 157969.17113451968, 95345.249178385886},
- { 157969.17113451968, -95345.249178385886},
- {-157969.17113451968, 95345.249178385886},
- {-157969.17113451968, -95345.249178385886},
- };
-
- XY inv_in[] = {
- { 200, 100},
- { 200,-100},
- {-200, 100},
- {-200,-100}
- };
-
- LP s_inv_expect[] = {
- { 0.0025321396391918614, 0.001048846580346495},
- { 0.0025321396391918614, -0.001048846580346495},
- {-0.0025321396391918614, 0.001048846580346495},
- {-0.0025321396391918614, -0.001048846580346495},
- };
-
- 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_gall_selftest (void) {return 10000;}
diff --git a/src/PJ_geos.c b/src/PJ_geos.c
index 5fd3e56b..7d527409 100644
--- a/src/PJ_geos.c
+++ b/src/PJ_geos.c
@@ -234,61 +234,4 @@ PJ *PROJECTION(geos) {
}
-#ifndef PJ_SELFTEST
-int pj_geos_selftest (void) {return 0;}
-#else
-
-int pj_geos_selftest (void) {
- double tolerance_lp = 1e-10;
- double tolerance_xy = 1e-7;
-
- char e_args[] = {"+proj=geos +ellps=GRS80 +lat_1=0.5 +lat_2=2 +h=35785831"};
- char s_args[] = {"+proj=geos +R=6400000 +lat_1=0.5 +lat_2=2 +h=35785831"};
-
- LP fwd_in[] = {
- { 2, 1},
- { 2,-1},
- {-2, 1},
- {-2,-1}
- };
-
- XY e_fwd_expect[] = {
- { 222527.07036580026, 110551.30341332949},
- { 222527.07036580026, -110551.30341332949},
- {-222527.07036580026, 110551.30341332949},
- {-222527.07036580026, -110551.30341332949},
- };
-
- XY s_fwd_expect[] = {
- { 223289.45763579503, 111677.65745653701},
- { 223289.45763579503, -111677.65745653701},
- {-223289.45763579503, 111677.65745653701},
- {-223289.45763579503, -111677.65745653701},
- };
-
- XY inv_in[] = {
- { 200, 100},
- { 200,-100},
- {-200, 100},
- {-200,-100}
- };
-
- LP e_inv_expect[] = {
- { 0.0017966305689715385, 0.00090436947723267452},
- { 0.0017966305689715385, -0.00090436947723267452},
- {-0.0017966305689715385, 0.00090436947723267452},
- {-0.0017966305689715385, -0.00090436947723267452},
- };
-
- LP s_inv_expect[] = {
- { 0.0017904931105078943, 0.00089524655504237148},
- { 0.0017904931105078943, -0.00089524655504237148},
- {-0.0017904931105078943, 0.00089524655504237148},
- {-0.0017904931105078943, -0.00089524655504237148},
- };
-
- 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_geos_selftest (void) {return 10000;}
diff --git a/src/PJ_gins8.c b/src/PJ_gins8.c
index b27ec092..26db4f31 100644
--- a/src/PJ_gins8.c
+++ b/src/PJ_gins8.c
@@ -31,32 +31,4 @@ PJ *PROJECTION(gins8) {
}
-#ifndef PJ_SELFTEST
-int pj_gins8_selftest (void) {return 0;}
-#else
-
-int pj_gins8_selftest (void) {
- double tolerance_lp = 1e-10;
- double tolerance_xy = 1e-7;
-
- char s_args[] = {"+proj=gins8 +a=6400000 +lat_1=0.5 +lat_2=2"};
-
- LP fwd_in[] = {
- { 2, 1},
- { 2,-1},
- {-2, 1},
- {-2,-1}
- };
-
- XY s_fwd_expect[] = {
- { 194350.25093959007, 111703.90763533533},
- { 194350.25093959007, -111703.90763533533},
- {-194350.25093959007, 111703.90763533533},
- {-194350.25093959007, -111703.90763533533},
- };
-
- 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_gins8_selftest (void) {return 10000;}
diff --git a/src/PJ_gn_sinu.c b/src/PJ_gn_sinu.c
index d13f2834..bfe26b53 100644
--- a/src/PJ_gn_sinu.c
+++ b/src/PJ_gn_sinu.c
@@ -120,7 +120,7 @@ PJ *PROJECTION(sinu) {
if (!(Q->en = pj_enfn(P->es)))
return pj_default_destructor (P, ENOMEM);
-
+
if (P->es != 0.0) {
P->inv = e_inverse;
P->fwd = e_forward;
@@ -184,194 +184,7 @@ PJ *PROJECTION(gn_sinu) {
}
-#ifndef PJ_SELFTEST
-int pj_sinu_selftest (void) {return 0;}
-#else
-
-int pj_sinu_selftest (void) {
- double tolerance_lp = 1e-10;
- double tolerance_xy = 1e-7;
-
- char e_args[] = {"+proj=sinu +ellps=GRS80 +lat_1=0.5 +lat_2=2"};
- char s_args[] = {"+proj=sinu +R=6400000 +lat_1=0.5 +lat_2=2"};
-
- LP fwd_in[] = {
- { 2, 1},
- { 2,-1},
- {-2, 1},
- {-2,-1}
- };
-
- XY e_fwd_expect[] = {
- { 222605.29953946592, 110574.38855415257},
- { 222605.29953946592, -110574.38855415257},
- {-222605.29953946592, 110574.38855415257},
- {-222605.29953946592, -110574.38855415257},
- };
-
- XY s_fwd_expect[] = {
- { 223368.11902663155, 111701.07212763709},
- { 223368.11902663155, -111701.07212763709},
- {-223368.11902663155, 111701.07212763709},
- {-223368.11902663155, -111701.07212763709},
- };
-
- XY inv_in[] = {
- { 200, 100},
- { 200,-100},
- {-200, 100},
- {-200,-100}
- };
-
- LP e_inv_expect[] = {
- { 0.0017966305684613522, 0.00090436947707945409},
- { 0.0017966305684613522, -0.00090436947707945409},
- {-0.0017966305684613522, 0.00090436947707945409},
- {-0.0017966305684613522, -0.00090436947707945409},
- };
-
- LP s_inv_expect[] = {
- { 0.0017904931100023887, 0.00089524655489191132},
- { 0.0017904931100023887, -0.00089524655489191132},
- {-0.0017904931100023887, 0.00089524655489191132},
- {-0.0017904931100023887, -0.00089524655489191132},
- };
-
- 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
-
-#ifndef PJ_SELFTEST
-int pj_eck6_selftest (void) {return 0;}
-#else
-
-int pj_eck6_selftest (void) {
- double tolerance_lp = 1e-10;
- double tolerance_xy = 1e-7;
-
- char s_args[] = {"+proj=eck6 +a=6400000 +lat_1=0.5 +lat_2=2"};
-
- LP fwd_in[] = {
- { 2, 1},
- { 2,-1},
- {-2, 1},
- {-2,-1}
- };
-
- XY s_fwd_expect[] = {
- { 197021.60562899226, 126640.42073317352},
- { 197021.60562899226, -126640.42073317352},
- {-197021.60562899226, 126640.42073317352},
- {-197021.60562899226, -126640.42073317352},
- };
-
- XY inv_in[] = {
- { 200, 100},
- { 200,-100},
- {-200, 100},
- {-200,-100}
- };
-
- LP s_inv_expect[] = {
- { 0.002029978749734037, 0.00078963032910382171},
- { 0.002029978749734037, -0.00078963032910382171},
- {-0.002029978749734037, 0.00078963032910382171},
- {-0.002029978749734037, -0.00078963032910382171},
- };
-
- 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_mbtfps_selftest (void) {return 0;}
-#else
-
-int pj_mbtfps_selftest (void) {
- double tolerance_lp = 1e-10;
- double tolerance_xy = 1e-7;
-
- char s_args[] = {"+proj=mbtfps +a=6400000 +lat_1=0.5 +lat_2=2"};
-
- LP fwd_in[] = {
- { 2, 1},
- { 2,-1},
- {-2, 1},
- {-2,-1}
- };
-
- XY s_fwd_expect[] = {
- { 204740.11747857218, 121864.72971934026},
- { 204740.11747857218, -121864.72971934026},
- {-204740.11747857218, 121864.72971934026},
- {-204740.11747857218, -121864.72971934026},
- };
-
- XY inv_in[] = {
- { 200, 100},
- { 200,-100},
- {-200, 100},
- {-200,-100}
- };
-
- LP s_inv_expect[] = {
- { 0.0019534152166442065, 0.00082057965689633387},
- { 0.0019534152166442065, -0.00082057965689633387},
- {-0.0019534152166442065, 0.00082057965689633387},
- {-0.0019534152166442065, -0.00082057965689633387},
- };
-
- 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_gn_sinu_selftest (void) {return 0;}
-#else
-
-int pj_gn_sinu_selftest (void) {
- double tolerance_lp = 1e-10;
- double tolerance_xy = 1e-7;
-
- char s_args[] = {"+proj=gn_sinu +a=6400000 +lat_1=0.5 +lat_2=2 +m=1 +n=2"};
-
- LP fwd_in[] = {
- { 2, 1},
- { 2,-1},
- {-2, 1},
- {-2,-1}
- };
-
- XY s_fwd_expect[] = {
- { 223385.13250469571, 111698.23644718733},
- { 223385.13250469571, -111698.23644718733},
- {-223385.13250469571, 111698.23644718733},
- {-223385.13250469571, -111698.23644718733},
- };
-
- XY inv_in[] = {
- { 200, 100},
- { 200,-100},
- {-200, 100},
- {-200,-100}
- };
-
- LP s_inv_expect[] = {
- { 0.0017904931098931057, 0.00089524655491012516},
- { 0.0017904931098931057, -0.00089524655491012516},
- {-0.0017904931098931057, 0.00089524655491012516},
- {-0.0017904931098931057, -0.00089524655491012516},
- };
-
- 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_sinu_selftest (void) {return 10000;}
+int pj_eck6_selftest (void) {return 10000;}
+int pj_mbtfps_selftest (void) {return 10000;}
+int pj_gn_sinu_selftest (void) {return 10000;}
diff --git a/src/PJ_gnom.c b/src/PJ_gnom.c
index 1d3f3386..2aedefec 100644
--- a/src/PJ_gnom.c
+++ b/src/PJ_gnom.c
@@ -136,46 +136,4 @@ PJ *PROJECTION(gnom) {
}
-#ifndef PJ_SELFTEST
-int pj_gnom_selftest (void) {return 0;}
-#else
-
-int pj_gnom_selftest (void) {
- double tolerance_lp = 1e-10;
- double tolerance_xy = 1e-7;
-
- char s_args[] = {"+proj=gnom +a=6400000 +lat_1=0.5 +lat_2=2"};
-
- LP fwd_in[] = {
- { 2, 1},
- { 2,-1},
- {-2, 1},
- {-2,-1}
- };
-
- XY s_fwd_expect[] = {
- { 223492.92474718543, 111780.50920659291},
- { 223492.92474718543, -111780.50920659291},
- {-223492.92474718543, 111780.50920659291},
- {-223492.92474718543, -111780.50920659291},
- };
-
- XY inv_in[] = {
- { 200, 100},
- { 200,-100},
- {-200, 100},
- {-200,-100}
- };
-
- LP s_inv_expect[] = {
- { 0.0017904931092009798, 0.00089524655438192376},
- { 0.0017904931092009798, -0.00089524655438192376},
- {-0.0017904931092009798, 0.00089524655438192376},
- {-0.0017904931092009798, -0.00089524655438192376},
- };
-
- 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_gnom_selftest (void) {return 10000;}
diff --git a/src/PJ_goode.c b/src/PJ_goode.c
index 3bfeb21f..3c5d172d 100644
--- a/src/PJ_goode.c
+++ b/src/PJ_goode.c
@@ -71,7 +71,7 @@ PJ *PROJECTION(goode) {
Q->moll->ctx = P->ctx;
if (!(Q->sinu = pj_sinu(Q->sinu)) || !(Q->moll = pj_moll(Q->moll)))
return destructor (P, ENOMEM);
-
+
P->fwd = s_forward;
P->inv = s_inverse;
@@ -79,46 +79,4 @@ PJ *PROJECTION(goode) {
}
-#ifndef PJ_SELFTEST
-int pj_goode_selftest (void) {return 0;}
-#else
-
-int pj_goode_selftest (void) {
- double tolerance_lp = 1e-10;
- double tolerance_xy = 1e-7;
-
- char s_args[] = {"+proj=goode +a=6400000 +lat_1=0.5 +lat_2=2"};
-
- LP fwd_in[] = {
- { 2, 1},
- { 2,-1},
- {-2, 1},
- {-2,-1}
- };
-
- XY s_fwd_expect[] = {
- { 223368.11902663155, 111701.07212763709},
- { 223368.11902663155, -111701.07212763709},
- {-223368.11902663155, 111701.07212763709},
- {-223368.11902663155, -111701.07212763709},
- };
-
- XY inv_in[] = {
- { 200, 100},
- { 200,-100},
- {-200, 100},
- {-200,-100}
- };
-
- LP s_inv_expect[] = {
- { 0.0017904931100023887, 0.00089524655489191132},
- { 0.0017904931100023887, -0.00089524655489191132},
- {-0.0017904931100023887, 0.00089524655489191132},
- {-0.0017904931100023887, -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_goode_selftest (void) {return 10000;}
diff --git a/src/PJ_gstmerc.c b/src/PJ_gstmerc.c
index c2846761..efb44b88 100644
--- a/src/PJ_gstmerc.c
+++ b/src/PJ_gstmerc.c
@@ -69,47 +69,4 @@ PJ *PROJECTION(gstmerc) {
}
-#ifndef PJ_SELFTEST
-int pj_gstmerc_selftest (void) {return 0;}
-#else
-
-int pj_gstmerc_selftest (void) {
- double tolerance_lp = 1e-10;
- double tolerance_xy = 1e-7;
-
- char s_args[] = {"+proj=gstmerc +R=6400000 +lat_1=0.5 +lat_2=2"};
-
- LP fwd_in[] = {
- { 2, 1},
- { 2,-1},
- {-2, 1},
- {-2,-1}
- };
-
-
- XY s_fwd_expect[] = {
- { 223413.46640632182, 111769.14504058557},
- { 223413.46640632182, -111769.14504058668},
- {-223413.46640632302, 111769.14504058557},
- {-223413.46640632302, -111769.14504058668},
- };
-
- XY inv_in[] = {
- { 200, 100},
- { 200,-100},
- {-200, 100},
- {-200,-100}
- };
-
- LP s_inv_expect[] = {
- { 0.0017904931097109673, 0.0008952465544509083},
- { 0.0017904931097109673, -0.0008952465544509083},
- {-0.0017904931097109673, 0.0008952465544509083},
- {-0.0017904931097109673, -0.0008952465544509083},
- };
-
- 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_gstmerc_selftest (void) {return 10000;}