REFAC: Update baselines (RPC refactoring) and remove noisy cout

97996afe · Cédric Traizet · 20c1ed52 · 97996afe · 97996afe · 97996afe
Commit 97996afe authored Feb 03, 2021 by Cédric Traizet
--- a/Data/Baseline/Examples/Projections/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
+++ b/Data/Baseline/Examples/Projections/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
-Image (0x1a6f470)
-  RTTI typeinfo:   otb::Image<float, 2u>
-  Reference Count: 2
-  Modified Time: 141
-  Debug: Off
-  Object Name: 
-  Observers: 
-    none
-  Source: (0x1a6f820) 
-  Source output name: Primary
-  Release Data: Off
-  Data Released: False
-  Global Release Data: Off
-  PipelineMTime: 138
-  UpdateMTime: 0
-  RealTimeStamp: 0.0000000000 seconds 
-  LargestPossibleRegion: 
-    Dimension: 2
-    Index: [0, 0]
-    Size: [3000, 3000]
-  BufferedRegion: 
-    Dimension: 2
-    Index: [0, 0]
-    Size: [0, 0]
-  RequestedRegion: 
-    Dimension: 2
-    Index: [0, 0]
-    Size: [3000, 3000]
-  Spacing: [1.0000000000, 1.0000000000]
-  Origin: [0.5000000000, 0.5000000000]
-  Direction: 
-1.0000000000 0.0000000000
-0.0000000000 1.0000000000
-
-  IndexToPointMatrix: 
-1.0000000000 0.0000000000
-0.0000000000 1.0000000000
-
-  PointToIndexMatrix: 
-1.0000000000 0.0000000000
-0.0000000000 1.0000000000
-
-  Inverse Direction: 
-1.0000000000 0.0000000000
-0.0000000000 1.0000000000
-
-  PixelContainer: 
-    ImportImageContainer (0x1a6f650)
-      RTTI typeinfo:   itk::ImportImageContainer<unsigned long, float>
-      Reference Count: 1
-      Modified Time: 18
-      Debug: Off
-      Object Name: 
-      Observers: 
-        none
-      Pointer: 0
-      Container manages memory: true
-      Size: 0
-      Capacity: 0
-  ---> DataType = 0
-  ---> DriverLongName = CEOS Image
-  ---> DriverShortName = CEOS
-  ---> LowerLeftCorner[0] = 0.0000000000
-  ---> LowerLeftCorner[1] = 3000.0000000000
-  ---> LowerRightCorner[0] = 3000.0000000000
-  ---> LowerRightCorner[1] = 3000.0000000000
-  ---> OSSIMKeywordlist
-   Ossim Keyword list:
-  adjustment_0.adj_param_0.center:  0
-adjustment_0.adj_param_0.description:  intrack_offset
-adjustment_0.adj_param_0.lock_flag:  0
-adjustment_0.adj_param_0.parameter:  0
-adjustment_0.adj_param_0.sigma:  50
-adjustment_0.adj_param_0.units:  pixel
-adjustment_0.adj_param_1.center:  0
-adjustment_0.adj_param_1.description:  crtrack_offset
-adjustment_0.adj_param_1.lock_flag:  0
-adjustment_0.adj_param_1.parameter:  0
-adjustment_0.adj_param_1.sigma:  50
-adjustment_0.adj_param_1.units:  pixel
-adjustment_0.adj_param_2.center:  0
-adjustment_0.adj_param_2.description:  intrack_scale
-adjustment_0.adj_param_2.lock_flag:  0
-adjustment_0.adj_param_2.parameter:  0
-adjustment_0.adj_param_2.sigma:  50
-adjustment_0.adj_param_2.units:  unknown
-adjustment_0.adj_param_3.center:  0
-adjustment_0.adj_param_3.description:  crtrack_scale
-adjustment_0.adj_param_3.lock_flag:  0
-adjustment_0.adj_param_3.parameter:  0
-adjustment_0.adj_param_3.sigma:  50
-adjustment_0.adj_param_3.units:  unknown
-adjustment_0.adj_param_4.center:  0
-adjustment_0.adj_param_4.description:  map_rotation
-adjustment_0.adj_param_4.lock_flag:  0
-adjustment_0.adj_param_4.parameter:  0
-adjustment_0.adj_param_4.sigma:  0.1
-adjustment_0.adj_param_4.units:  degrees
-adjustment_0.description:  Initial adjustment
-adjustment_0.dirty_flag:  0
-adjustment_0.number_of_params:  5
-current_adjustment:  0
-height_off:  0
-height_scale:  4.5035996273705e+15
-lat_off:  -43.13823715
-lat_scale:  1
-line_den_coeff_0:  1
-line_den_coeff_1:  2.43189701059228
-line_den_coeff_10:  0
-line_den_coeff_11:  0.427993733624612
-line_den_coeff_12:  0.211112963392964
-line_den_coeff_13:  0
-line_den_coeff_14:  0.367481099808053
-line_den_coeff_15:  -0.393242099048278
-line_den_coeff_16:  0
-line_den_coeff_17:  0
-line_den_coeff_18:  0
-line_den_coeff_19:  0
-line_den_coeff_2:  4.20166177009252
-line_den_coeff_3:  0
-line_den_coeff_4:  -0.160493581744926
-line_den_coeff_5:  0
-line_den_coeff_6:  0
-line_den_coeff_7:  -0.269037030636058
-line_den_coeff_8:  -0.667969530867681
-line_den_coeff_9:  0
-line_num_coeff_0:  0.240525444509033
-line_num_coeff_1:  -3.13682519152775
-line_num_coeff_10:  5.05780223817459e-15
-line_num_coeff_11:  0.695793592435728
-line_num_coeff_12:  2.82251754264863
-line_num_coeff_13:  1.34538684327756e-15
-line_num_coeff_14:  0.463079410620594
-line_num_coeff_15:  0.222379206138169
-line_num_coeff_16:  -3.76392327824494e-39
-line_num_coeff_17:  -2.98517180447189e-40
-line_num_coeff_18:  -1.34473504680247e-40
-line_num_coeff_19:  0
-line_num_coeff_2:  0.346548655180022
-line_num_coeff_3:  -3.6731478667714e-15
-line_num_coeff_4:  -17.3762105306822
-line_num_coeff_5:  -1.18563642519605e-12
-line_num_coeff_6:  -4.59667104442646e-13
-line_num_coeff_7:  -9.24949285654521
-line_num_coeff_8:  -2.94080878691262
-line_num_coeff_9:  9.75220202913922e-14
-line_off:  1500.5
-line_scale:  1454.5
-long_off:  -22.88265985
-long_scale:  1
-number_of_adjustments:  1
-polynomial_format:  B
-samp_den_coeff_0:  1
-samp_den_coeff_1:  10.2569493509116
-samp_den_coeff_10:  0
-samp_den_coeff_11:  1.5540812085977
-samp_den_coeff_12:  1.0328092004279
-samp_den_coeff_13:  0
-samp_den_coeff_14:  -1.32560471731861
-samp_den_coeff_15:  -0.109971870820347
-samp_den_coeff_16:  0
-samp_den_coeff_17:  0
-samp_den_coeff_18:  0
-samp_den_coeff_19:  0
-samp_den_coeff_2:  -0.673329431520661
-samp_den_coeff_3:  0
-samp_den_coeff_4:  -0.0898098294659881
-samp_den_coeff_5:  0
-samp_den_coeff_6:  0
-samp_den_coeff_7:  -1.01273131687892
-samp_den_coeff_8:  1.63658544331894
-samp_den_coeff_9:  0
-samp_num_coeff_0:  -0.0293896997028787
-samp_num_coeff_1:  -1.06364616725089
-samp_num_coeff_10:  2.51292516596346e-13
-samp_num_coeff_11:  -0.130988460347871
-samp_num_coeff_12:  0.715080909979046
-samp_num_coeff_13:  -5.44410980146769e-15
-samp_num_coeff_14:  -3.40023401886119
-samp_num_coeff_15:  4.06427430084709
-samp_num_coeff_16:  3.7210399260609e-16
-samp_num_coeff_17:  -8.27988733245361e-26
-samp_num_coeff_18:  0
-samp_num_coeff_19:  0
-samp_num_coeff_2:  2.74938094322821
-samp_num_coeff_3:  -5.80757287997929e-10
-samp_num_coeff_4:  28.4971056225152
-samp_num_coeff_5:  -9.75802000107915e-11
-samp_num_coeff_6:  5.79346199894214e-11
-samp_num_coeff_7:  -8.00166234441079
-samp_num_coeff_8:  -1.68546715570593
-samp_num_coeff_9:  -1.50596504636281e-13
-samp_off:  1477.5
-samp_scale:  1406.5
-type:  ossimRpcProjection
-  ---> ResolutionFactor = 0
-  ---> SubDatasetIndex = 0
-  ---> TileHintX = 3000
-  ---> TileHintY = 1
-  ---> UpperLeftCorner[0] = 0.0000000000
-  ---> UpperLeftCorner[1] = 0.0000000000
-  ---> UpperRightCorner[0] = 3000.0000000000
-  ---> UpperRightCorner[1] = 0.0000000000
-
-Residual ground error: 2.8481201293
+{"LineOffset": "2224.5", "SampleOffset": "2224.5", "LatOffset": "43.6089", "LonOffset": "1.42524", "HeightOffset": "0", "LineScale": "225.5", "SampleScale": "225.5", "LatScale": "1", "LonScale": "1", "HeightScale": "1", "LineNum": [ "0.00176507",  "0.469826",  "-182.989",  "-3.97557e-14",  "0.000167599",  "-4.11403e-23",  "4.64211e-36",  "-0.000132256",  "-0.00299522",  "0",  "0",  "4.13719e-05",  "-2.66116e-05",  "0",  "-0.00378323",  "-0.0039722",  "0",  "0",  "0",  "0", ], "LineDen": [ "1",  "0.116648",  "-0.795797",  "0",  "-0.0017625",  "0",  "0",  "-0.692057",  "-0.725159",  "0",  "0",  "4.24205e-06",  "-1.2217e-05",  "0",  "-1.62292e-05",  "-1.11751e-05",  "0",  "0",  "0",  "0", ], "SampleNum": [ "-4.03023e-05",  "140.123",  "0.720549",  "-3.96237e-14",  "-0.000307018",  "-6.10744e-25",  "3.08505e-39",  "7.06292e-05",  "0.000393857",  "0",  "0",  "0.00514045",  "0.00169871",  "0",  "3.04772e-06",  "3.05975e-05",  "0",  "0",  "0",  "0", ], "SampleDen": [ "1",  "-0.0140652",  "0.0561119",  "0",  "-0.00165428",  "0",  "0",  "-0.720295",  "-0.238046",  "0",  "0",  "-2.11567e-07",  "-2.527e-06",  "0",  "1.28729e-06",  "7.08213e-06",  "0",  "0",  "0",  "0", ], }
+Residual ground error: 1.2432282311
--- a/Data/Baseline/Examples/Projections/vectorDataProjectionExample.1.dbf
+++ b/Data/Baseline/Examples/Projections/vectorDataProjectionExample.1.dbf
--- a/Data/Baseline/Examples/Projections/vectorDataProjectionExample.1.shp
+++ b/Data/Baseline/Examples/Projections/vectorDataProjectionExample.1.shp
--- a/Data/Baseline/Examples/Projections/vectorDataProjectionExample.1.shx
+++ b/Data/Baseline/Examples/Projections/vectorDataProjectionExample.1.shx
--- a/Examples/Projections/test/CMakeLists.txt
+++ b/Examples/Projections/test/CMakeLists.txt
@@ -82,28 +82,108 @@ otb_add_test(NAME prTeEstimateRPCSensorModelExampleTest COMMAND ${OTB_TEST_DRIVE
    ${TEMP}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
  --ignore-lines-with 6 PipelineMTime ImportImageContaine Source: Image Time: Pointer:
  Execute $<TARGET_FILE:EstimateRPCSensorModelExample>
-    LARGEINPUT{SPOT4/RIO_DE_JANEIRO/IMAG_01.DAT}
+    ${INPUTDATA}/QB_TOULOUSE_MUL_Extract_500_500.tif
    ${TEMP}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
-    1199 1259 -22.76847 -43.168043 0.
-    1497 727  -22.688931 -43.066686 0.
-    699 1146 -22.7254 -43.288651 0.
-    1379 2457 -22.986073 -43.193502 0.
-    2592 1846 -22.932684 -42.854215 0.
-    1430 1797 -22.872988 -43.136813 0.
-    587 2654 -22.983847  -43.393297 0.
-    2398 2422 -23.025664 -42.928778 0.
-    1436 2946 -23.074483 -43.192431 0.
-    963 2915  -23.047382 -43.310011 0.
-    1081 1024 -22.721919 -43.18523  0.
-    1395 1213 -22.769191 -43.116752 0.
-    1781 2202 -22.959556 -43.069911 0.
-    2803 1942 -22.958868 -42.808235 0.
-    980 2734 -22.99534 -43.309672 0.
-    713 2754 -23.007862 -43.365307 0.
-    72 2955 -23.012153 -43.541331 0.
-    2884 1898 -22.954691 -42.786188 0.
-    2539 47 -22.616041 -42.777877 0.
-    577 183 -22.551654 -43.271813 0.
+  2000 2000 1.41809 43.6143 0
+  2000 2050 1.4181 43.6131 0
+  2000 2100 1.4181 43.6119 0
+  2000 2150 1.41811 43.6107 0
+  2000 2200 1.41812 43.6095 0
+  2000 2250 1.41812 43.6083 0
+  2000 2300 1.41813 43.6071 0
+  2000 2350 1.41814 43.6058 0
+  2000 2400 1.41814 43.6046 0
+  2000 2450 1.41815 43.6034 0
+  2050 2000 1.41967 43.6143 0
+  2050 2050 1.41968 43.6131 0
+  2050 2100 1.41969 43.6119 0
+  2050 2150 1.41969 43.6107 0
+  2050 2200 1.4197 43.6095 0
+  2050 2250 1.41971 43.6083 0
+  2050 2300 1.41971 43.6071 0
+  2050 2350 1.41972 43.6059 0
+  2050 2400 1.41973 43.6046 0
+  2050 2450 1.41973 43.6034 0
+  2100 2000 1.42126 43.6143 0
+  2100 2050 1.42126 43.6131 0
+  2100 2100 1.42127 43.6119 0
+  2100 2150 1.42128 43.6107 0
+  2100 2200 1.42128 43.6095 0
+  2100 2250 1.42129 43.6083 0
+  2100 2300 1.4213 43.6071 0
+  2100 2350 1.4213 43.6059 0
+  2100 2400 1.42131 43.6046 0
+  2100 2450 1.42132 43.6034 0
+  2150 2000 1.42284 43.6143 0
+  2150 2050 1.42285 43.6131 0
+  2150 2100 1.42285 43.6119 0
+  2150 2150 1.42286 43.6107 0
+  2150 2200 1.42286 43.6095 0
+  2150 2250 1.42287 43.6083 0
+  2150 2300 1.42288 43.6071 0
+  2150 2350 1.42288 43.6059 0
+  2150 2400 1.42289 43.6046 0
+  2150 2450 1.4229 43.6034 0
+  2200 2000 1.42442 43.6144 0
+  2200 2050 1.42443 43.6131 0
+  2200 2100 1.42443 43.6119 0
+  2200 2150 1.42444 43.6107 0
+  2200 2200 1.42445 43.6095 0
+  2200 2250 1.42445 43.6083 0
+  2200 2300 1.42446 43.6071 0
+  2200 2350 1.42447 43.6059 0
+  2200 2400 1.42447 43.6046 0
+  2200 2450 1.42448 43.6034 0
+  2250 2000 1.42601 43.6144 0
+  2250 2050 1.42601 43.6131 0
+  2250 2100 1.42602 43.6119 0
+  2250 2150 1.42602 43.6107 0
+  2250 2200 1.42603 43.6095 0
+  2250 2250 1.42604 43.6083 0
+  2250 2300 1.42604 43.6071 0
+  2250 2350 1.42605 43.6059 0
+  2250 2400 1.42605 43.6047 0
+  2250 2450 1.42606 43.6034 0
+  2300 2000 1.42759 43.6144 0
+  2300 2050 1.42759 43.6131 0
+  2300 2100 1.4276 43.6119 0
+  2300 2150 1.42761 43.6107 0
+  2300 2200 1.42761 43.6095 0
+  2300 2250 1.42762 43.6083 0
+  2300 2300 1.42762 43.6071 0
+  2300 2350 1.42763 43.6059 0
+  2300 2400 1.42764 43.6047 0
+  2300 2450 1.42764 43.6034 0
+  2350 2000 1.42917 43.6144 0
+  2350 2050 1.42918 43.6131 0
+  2350 2100 1.42918 43.6119 0
+  2350 2150 1.42919 43.6107 0
+  2350 2200 1.42919 43.6095 0
+  2350 2250 1.4292 43.6083 0
+  2350 2300 1.42921 43.6071 0
+  2350 2350 1.42921 43.6059 0
+  2350 2400 1.42922 43.6047 0
+  2350 2450 1.42922 43.6034 0
+  2400 2000 1.43075 43.6144 0
+  2400 2050 1.43076 43.6131 0
+  2400 2100 1.43076 43.6119 0
+  2400 2150 1.43077 43.6107 0
+  2400 2200 1.43078 43.6095 0
+  2400 2250 1.43078 43.6083 0
+  2400 2300 1.43079 43.6071 0
+  2400 2350 1.43079 43.6059 0
+  2400 2400 1.4308 43.6047 0
+  2400 2450 1.43081 43.6034 0
+  2450 2000 1.43234 43.6144 0
+  2450 2050 1.43234 43.6132 0
+  2450 2100 1.43235 43.6119 0
+  2450 2150 1.43235 43.6107 0
+  2450 2200 1.43236 43.6095 0
+  2450 2250 1.43236 43.6083 0
+  2450 2300 1.43237 43.6071 0
+  2450 2350 1.43238 43.6059 0
+  2450 2400 1.43238 43.6047 0
+  2450 2450 1.43239 43.6034 0
 )

 otb_add_test(NAME prTePlaceNameToLonLatExampleTest COMMAND ${OTB_TEST_DRIVER}

--- a/Modules/IO/TestKernel/src/otbTestHelper.cxx
+++ b/Modules/IO/TestKernel/src/otbTestHelper.cxx
@@ -2635,9 +2635,7 @@ void TestHelper::ogrReportOnLayer(OGRLayer* ref_poLayer, const char* ref_pszWHER
  otbCheckValue("GetExtent", ref_poLayer->GetExtent(&ref_oExt, TRUE), test_poLayer->GetExtent(&test_oExt, TRUE), nbdiff, m_ReportErrors);

  if (ref_poLayer->GetExtent(&ref_oExt, TRUE) == OGRERR_NONE)
-  {std::cout << "test1 : " << ref_oExt.MinX << " " << ref_oExt.MinY << " " << ref_oExt.MaxX << " " << ref_oExt.MaxY << std::endl;
-std::cout << "ref1 : " << test_oExt.MinX << " " << test_oExt.MinY << " " << test_oExt.MaxX << " " << test_oExt.MaxY << std::endl;
-
+  {
    CheckValueTolerance("Extent: MinX", ref_oExt.MinX, test_oExt.MinX, nbdiff, m_ReportErrors, epsilon);
    CheckValueTolerance("Extent: MinY", ref_oExt.MinY, test_oExt.MinY, nbdiff, m_ReportErrors, epsilon);
    CheckValueTolerance("Extent: MaxX", ref_oExt.MaxX, test_oExt.MaxX, nbdiff, m_ReportErrors, epsilon);