rupture matching test updates

Author: cossatot

openquake/hme/model_test_frameworks/gem/unit_tests/test_data/rupture_matching_eval_matched_ruptures.csv

@@ -1,15 +1,15 @@
 eq,longitude,latitude,depth,magnitude,strike,dip,rake,occurrence_rate,cell_id,eq_dist,attitude_diff,rake_diff,likelihood,rupture
-0,122.84613648764069,13.393473300984715,22.0,6.1499999999999995,324.0982604867444,89.99999999999869,0.0,6.217723076923076e-05,836864fffffffff,0.008307445332028911,,,0.9924967328328388,1_959
-1,122.82444879123811,13.422612503171797,5.0,6.35,324.09320145788354,89.99999999999828,0.0,4.44449128540305e-05,836864fffffffff,0.008751188966072312,,,0.9924833018508216,11_20
-2,122.82444879123811,13.422612503171797,17.0,6.35,144.09320145751005,89.99999999999892,0.0,4.44449128540305e-05,836864fffffffff,0.008751188966072312,,,0.9924833018508216,11_632
-3,123.13515611661873,13.043089363159988,21.0,6.35,138.2705232295675,89.9999999999986,0.0,4.44449128540305e-05,836864fffffffff,0.009577834017931709,,,0.9924193426261817,11_863
-4,123.24021755955228,12.942734040361454,21.0,6.35,132.64286592590366,89.9999999999999,0.0,4.44449128540305e-05,836864fffffffff,0.056623999975138735,,,0.9887860685138056,11_871
-5,123.15902406860862,13.015642607875845,8.0,6.1499999999999995,136.7786155835828,89.99999999999974,0.0,6.217723076923076e-05,836864fffffffff,0.008121511350630986,,,0.8887198379846001,1_258
-6,123.39769667412976,12.791267785239032,10.0,6.75,315.76044417514083,89.9999999999981,0.0,2.819954861111111e-05,836864fffffffff,0.04854416788542823,,,0.989631027277521,15_160
-7,122.8678187969801,13.364332403917713,12.0,6.1499999999999995,324.1033025204291,89.99999999999974,0.0,6.217723076923076e-05,836864fffffffff,0.007953269401941514,,,0.9925250290144656,1_441
-8,122.97988381799169,13.221440625581813,14.0,6.85,141.1361538190983,89.99999999999655,0.0,3.43144414893617e-05,836864fffffffff,0.026060283180693623,,,0.9912919168608397,16_218
-9,122.93824935983814,13.26961269720836,12.0,7.05,141.93588061379316,89.9999999999997,0.0,4.573460674157303e-05,836864fffffffff,0.007548858951467621,,,0.9926343377865584,2_24
-10,123.39126255517168,12.797710797835844,12.0,6.45,135.75903803079837,89.9999999999986,0.0,4.011006188118812e-05,836864fffffffff,0.05048088112361234,,,0.989320094567085,12_369
-11,122.97988381799169,13.221440625581813,13.0,7.25,141.3340478025568,89.99999999999943,0.0,6.585217948717948e-05,836864fffffffff,0.026060283180693623,,,0.991394927789726,4_22
-12,123.51988382946314,12.668819896039038,6.0,6.05,318.14317892513344,89.99999999999802,0.0,7.753100952380953e-05,836860fffffffff,0.013649455201166645,,,0.9920520248494084,0_183
-13,123.78727949553483,12.304362287437804,8.0,6.05,139.35394269163342,89.99999999999655,0.0,7.753100952380953e-05,836860fffffffff,0.0523018481174991,,,0.9889193344187442,0_313
+0,122.84613648764069,13.393473300984715,22.0,6.1499999999999995,324.0982604867444,89.99999999999869,0.0,6.217723076923076e-05,836864fffffffff,0.008307445332028911,,,0.9924967328328383,88.1_959
+1,122.82444879123811,13.422612503171797,5.0,6.35,324.09320145788354,89.99999999999828,0.0,4.44449128540305e-05,836864fffffffff,0.008751188966072312,,,0.9924833018508216,88.3_20
+2,122.82444879123811,13.422612503171797,17.0,6.35,144.09320145751005,89.99999999999892,0.0,4.44449128540305e-05,836864fffffffff,0.008751188966072312,,,0.9924833018508216,88.3_632
+3,123.13515611661873,13.043089363159988,21.0,6.35,138.2705232295675,89.9999999999986,0.0,4.44449128540305e-05,836864fffffffff,0.009577834017931709,,,0.9924193426261817,88.3_863
+4,123.24021755955228,12.942734040361454,21.0,6.35,132.64286592590366,89.9999999999999,0.0,4.44449128540305e-05,836864fffffffff,0.056623999975138735,,,0.9887860685138056,88.3_871
+5,123.15902406860862,13.015642607875845,8.0,6.1499999999999995,136.7786155835828,89.99999999999974,0.0,6.217723076923076e-05,836864fffffffff,0.008121511350630986,,,0.8887198379846001,88.1_258
+6,123.39769667412976,12.791267785239032,10.0,6.75,315.76044417514083,89.9999999999981,0.0,2.819954861111111e-05,836864fffffffff,0.04854416788542823,,,0.989631027277521,88.7_160
+7,122.8678187969801,13.364332403917713,12.0,6.1499999999999995,324.1033025204291,89.99999999999974,0.0,6.217723076923076e-05,836864fffffffff,0.007953269401941514,,,0.9925250290144652,88.1_441
+8,122.97988381799169,13.221440625581813,14.0,6.85,141.1361538190983,89.99999999999655,0.0,3.43144414893617e-05,836864fffffffff,0.026060283180693623,,,0.9912919168608397,88.8_218
+9,122.93824935983814,13.26961269720836,12.0,7.05,141.93588061379316,89.9999999999997,0.0,4.573460674157303e-05,836864fffffffff,0.007548858951467621,,,0.9926343377865584,88.10_24
+10,123.39126255517168,12.797710797835844,12.0,6.45,135.75903803079837,89.9999999999986,0.0,4.011006188118812e-05,836864fffffffff,0.05048088112361234,,,0.989320094567085,88.4_369
+11,122.97988381799169,13.221440625581813,13.0,7.25,141.3340478025568,89.99999999999943,0.0,6.585217948717948e-05,836864fffffffff,0.026060283180693623,,,0.991394927789726,88.12_22
+12,123.51988382946314,12.668819896039038,6.0,6.05,318.14317892513344,89.99999999999802,0.0,7.753100952380953e-05,836860fffffffff,0.013649455201166645,,,0.9920520248494084,88.0_183
+13,123.78727949553483,12.304362287437804,8.0,6.05,139.35394269163342,89.99999999999655,0.0,7.753100952380953e-05,836860fffffffff,0.0523018481174991,,,0.9889193344187442,88.0_313

openquake/hme/model_test_frameworks/gem/unit_tests/test_gem_test_functions.py

@@ -396,7 +396,7 @@ def test_get_matching_rups_sample(self):
         )
 
         assert isinstance(matching_rup, pd.Series)
-        assert matching_rup.name == "4_22"
+        assert matching_rup.name == "88.12_22"
 
     def test_match_eqs_to_rups(self):
         match_results = match_eqs_to_rups(