Skip to content

Commit 1cb4fd2

Browse files
rogerfraserrogerfraser
authored
Merge pull request #77 from rogerfraser/code-enhancements
Update tests and data
2 parents 1b8143a + 1bca21e commit 1cb4fd2

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

‎dynadjust/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,10 @@ if (BUILD_TESTING)
206206
add_test (NAME adj-psu00-xml-data COMMAND $<TARGET_FILE:dnaadjustwrapper> pseudo --output-adj-msr --free-stn-sd 5.0 --fixed-stn-sd 0.000005 --max-iterations 15 --output-tstat-adj-msr --sort-adj-msr-field 7 --sort-stn-orig-order --stn-coord-types XYZPLHhENz --angular-stn-type 1 --angular-msr-type 1 --precision-stn-linear 3 --precision-msr-linear 3 --precision-stn-angular 4 --precision-msr-angular 4 --output-pos-uncertainty --output-all-covariances --output-corrections-file)
207207
add_test (NAME imp-gnss0-xml-data COMMAND $<TARGET_FILE:dnaimportwrapper> -n gnss_xml ./gnssstn.xml ./gnssmsr.xml --bounding-box -36.3000,145.4500,-36.4500,146.4500 --get-msrs-transcending-box --split-gnss-cluster-msrs --prefer-single-x-as-g)
208208
add_test (NAME imp-gnss1-xml-data COMMAND $<TARGET_FILE:dnaimportwrapper> -n gnss_xml ./gnssstn.xml ./gnssmsr.xml --include-stns-assoc-msrs "BEEC,BNLA,EURA,HOTH,MNSF,MYRT,320500750,385900240" --get-msrs-transcending-box --split-gnss-cluster-msrs --prefer-single-x-as-g -r itrf2014 --override-input-ref-frame)
209-
209+
add_test (NAME geo-interpolate-01 COMMAND $<TARGET_FILE:dnageoidwrapper> -g ${CMAKE_SOURCE_DIR}/../sampleData/gnss-network-geoid.gsb --interactive --latitude -36.3348253617 --longitude 145.5741006771)
210+
add_test (NAME geo-interpolate-02 COMMAND $<TARGET_FILE:dnageoidwrapper> -g ${CMAKE_SOURCE_DIR}/../sampleData/gnss-network-geoid.gsb --interactive --latitude -36.2704890597 --longitude 146.4809871537 --interpolation-method 0)
211+
add_test (NAME geo-interpolate-03 COMMAND $<TARGET_FILE:dnageoidwrapper> -g ${CMAKE_SOURCE_DIR}/../sampleData/gnss-network-geoid.gsb --summary)
212+
210213
# bash command to check results
211214
add_test (NAME test-gnss-network COMMAND bash -c "diff <(tail -n +53 gnss.simult.adj) <(tail -n +53 ${CMAKE_SOURCE_DIR}/../sampleData/gnss.simult.adj.expected)")
212215
#add_test (NAME test-urban-phased-network COMMAND bash -c "diff <(tail -n +62 urban.phased.adj) <(tail -n +62 ${CMAKE_SOURCE_DIR}/../sampleData/urban.phased.adj.expected)")

‎sampleData/gnss-network-geoid.gsb

141 KB
Binary file not shown.

‎sampleData/gnss.simult.adj.expected

+13-13
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
DYNADJUST ADJUSTMENT OUTPUT FILE
33

44
Version: 1.0.3, Debug
5-
Build: Oct 20 2020, 23:01:31 (GNU GCC 10.2.1 20200723 (Red Hat 10.2.1-1))
6-
File created: Tuesday, 20 October 2020, 23:03:17
5+
Build: Oct 22 2020, 21:06:54 (GNU GCC 10.2.1 20200723 (Red Hat 10.2.1-1))
6+
File created: Thursday, 22 October 2020, 21:24:55
77
File name: /home/roger/dev/rogerfraser/DynAdjust/dynadjust/build_gcc/./gnss.simult.adj
88

99
Command line arguments: /home/roger/dev/rogerfraser/DynAdjust/dynadjust/build_gcc/dynadjust/dnaadjustwrapper/dnaadjust gnss --output-adj-msr
@@ -33,17 +33,17 @@ Stations printed in blocks: No
3333
--------------------------------------------------------------------------------
3434
ITERATION 1
3535

36-
Elapsed time 00:00:00.008000
37-
Maximum station correction Station 349800490
38-
-0.517, -1.447, 11.863 (e, n, up)
36+
Elapsed time 00:00:00.009000
37+
Maximum station correction Station 380800400
38+
0.006, 0.007, -10.465 (e, n, up)
3939

4040

4141
--------------------------------------------------------------------------------
4242
ITERATION 2
4343

4444
Elapsed time 00:00:00
45-
Maximum station correction Station 349800490
46-
-9.5e-07, -3.3e-06, 7.4e-06 (e, n, up)
45+
Maximum station correction Station 380800400
46+
-8.4e-07, -2.5e-06, -4.8e-06 (e, n, up)
4747

4848

4949
--------------------------------------------------------------------------------
@@ -508,7 +508,7 @@ Station Const Latitude Longitude H(Ortho) h(Ellipse)
508508
260801050 FFF -36.451861004 145.350125252 176.7759 185.0400 -4220825.4956 2891825.6482 -3795769.9675 0.0022 0.0022 0.0057 EUROA PM 105
509509
260801120 FFF -36.442728180 145.335395950 171.5002 179.7195 -4220659.0953 2893735.4267 -3794498.9438 0.0022 0.0022 0.0057 EUROA PM 112
510510
260801700 FFF -36.451877881 145.340484475 174.0624 182.2747 -4220030.1075 2892976.8070 -3795772.4810 0.0022 0.0022 0.0057 EUROA PM 170
511-
261000380 FFF -36.255946686 146.323341742 198.2694 198.2694 -4286411.6817 2832531.3526 -3767089.7082 0.0022 0.0021 0.0056
511+
261000380 FFF -36.255946686 146.323341742 187.6375 198.2694 -4286411.6817 2832531.3526 -3767089.7082 0.0022 0.0021 0.0056
512512
305600730 FFF -37.030760274 146.051764533 317.8580 327.1910 -4229799.2969 2843568.0889 -3822207.4542 0.0023 0.0022 0.0056
513513
309800190 FFF -36.583845375 145.424076421 336.3503 344.9459 -4215140.8097 2874153.5901 -3815592.7108 0.0023 0.0022 0.0062 309800190, ?, ?
514514
320500750 FFF -36.363677964 146.234156554 181.8212 192.0365 -4269352.0173 2837100.7269 -3782873.7669 0.0022 0.0021 0.0053 320500750, ?, ?
@@ -519,14 +519,14 @@ Station Const Latitude Longitude H(Ortho) h(Ellipse)
519519
324901240 FFF -36.335529083 146.441167754 383.3658 394.7911 -4288812.9539 2813305.8576 -3778997.4661 0.0023 0.0023 0.0056 MYRTLEFORD PM 124
520520
341301360 FFF -36.433820898 146.564408504 316.6780 329.0022 -4290012.7661 2791763.6390 -3793375.8691 0.0032 0.0037 0.0140 341301360, ?, ?
521521
341301380 FFF -36.434446443 146.564081345 333.2243 345.5486 -4289882.9445 2791776.0145 -3793540.3211 0.0034 0.0038 0.0141 341301380, ?, ?
522-
349800490 FFF -36.270489059 146.480987159 1061.4338 1061.4338 -4298805.8700 2812765.9111 -3769224.8937 0.0029 0.0031 0.0096 STANLEY
523-
356000780 FFF -36.232714958 146.264677766 171.4253 171.4253 -4283949.9939 2841259.3921 -3763295.2417 0.0023 0.0021 0.0055
522+
349800490 FFF -36.270489059 146.480987159 1049.6453 1061.4338 -4298805.8700 2812765.9111 -3769224.8937 0.0029 0.0031 0.0096 STANLEY
523+
356000780 FFF -36.232714958 146.264677766 161.1231 171.4253 -4283949.9939 2841259.3921 -3763295.2417 0.0023 0.0021 0.0055
524524
380700500 FFF -36.455711695 146.245311408 245.6121 256.0849 -4261781.4073 2829939.2084 -3796763.4841 0.0022 0.0021 0.0053 WHITFIELD PM 50
525525
380800400 FFF -36.515845937 146.214853178 348.8055 359.2574 -4253758.4296 2830100.0540 -3805743.0585 0.0022 0.0021 0.0055 380800400, ?, ?
526-
384300430 FFF -36.312453172 146.032766840 172.0210 181.3164 -4257331.5310 2865374.2015 -3775136.7149 0.0023 0.0023 0.0068 WINTON PM 43
527-
384300490 FFF -36.304479435 146.050164056 174.5937 183.9468 -4259243.1777 2863842.2101 -3774153.8447 0.0023 0.0023 0.0069 WINTON PM 49
526+
384300430 FFF -36.312453172 146.032766840 172.0214 181.3164 -4257331.5310 2865374.2015 -3775136.7149 0.0023 0.0023 0.0068 WINTON PM 43
527+
384300490 FFF -36.304479435 146.050164056 174.5938 183.9468 -4259243.1777 2863842.2101 -3774153.8447 0.0023 0.0023 0.0069 WINTON PM 49
528528
385900240 FFF -36.505815216 145.402354030 798.6403 807.2544 -4220571.7137 2881971.9439 -3804524.1681 0.0022 0.0022 0.0056
529-
BEEC FFF -36.204716260 146.392787494 442.9330 442.9330 -4297030.4381 2827160.2309 -3759485.1829 0.0021 0.0021 0.0048 BEEC
529+
BEEC FFF -36.204716260 146.392787494 431.6862 442.9330 -4297030.4381 2827160.2309 -3759485.1829 0.0021 0.0021 0.0048 BEEC
530530
BNLA FFF -36.323785070 146.002151064 178.1659 187.3619 -4253632.2844 2868465.8326 -3776956.3212 0.0021 0.0021 0.0050 BNLA
531531
EURA FFF -36.451142928 145.342225442 187.1334 195.3632 -4220394.7475 2892703.1823 -3795598.7892 0.0022 0.0022 0.0057 EURA
532532
HOTH FFF -36.585542694 147.083065410 1760.1713 1773.9191 -4286274.1603 2768476.3135 -3816870.3376 0.0027 0.0026 0.0084 HOTH

0 commit comments

Comments
 (0)