Removed zeros in agg_keys

Author: micheles

openquake/calculators/export/risk.py

@@ -595,12 +595,12 @@ def _fix(col):
 
 
 @export.add(('agg_keys', 'csv'))
-def export_agg_values_csv(ekey, dstore):
+def export_agg_keys_csv(ekey, dstore):
     """
     :param ekey: export key, i.e. a pair (datastore key, fmt)
     :param dstore: datastore object
     """
-    df = extract(dstore, 'agg_keys?')
+    df = extract(dstore, ekey[0] + '?')
     writer = writers.CsvWriter(fmt=writers.FIVEDIGITS)
     fname = dstore.export_path('%s.%s' % ekey)
     writer.save(df, fname, comment=dstore.metadata)

openquake/calculators/extract.py

@@ -819,20 +819,22 @@ def extract_agg_curves(dstore, what):
 def extract_agg_keys(dstore, what):
     """
     Aggregate the exposure values (one for each loss type) by tag. Use it as
-    /extract/agg_values?
+    /extract/agg_keys?
     """
     aggby = dstore['oqparam'].aggregate_by[0]
     keys = numpy.array([line.decode('utf8').split('\t')
                         for line in dstore['agg_keys'][:]])
     values = dstore['agg_values'][:-1]  # discard the total aggregation
+    ok = values['structural'] > 0
+    okvalues = values[ok]
     dic = {}
     for i, tag in enumerate(aggby):
-        dic[tag] = keys[:, i]
+        dic[tag] = keys[ok, i]
     for name in values.dtype.names:
-        dic[name] = values[name]
+        dic[name] = okvalues[name]
     return pandas.DataFrame(dic)
 
-    
+
 @extract.add('agg_losses')
 def extract_agg_losses(dstore, what):
     """

openquake/engine/tests/aristotle1/job.ini

@@ -10,3 +10,4 @@ maximum_distance = 600
 number_of_ground_motion_fields = 10
 asset_hazard_distance = 50
 tectonic_region_type = Active Shallow Crust
+aggregate_by = ID_1,OCCUPANCY

openquake/engine/tests/aristotle2/job.ini

@@ -10,3 +10,4 @@ maximum_distance = 400
 number_of_ground_motion_fields = 10
 asset_hazard_distance = 50
 tectonic_region_type = Tectonic_Type_A
+aggregate_by = ID_1,OCCUPANCY

openquake/engine/tests/aristotle3/job.ini

@@ -10,3 +10,4 @@ maximum_distance = 600
 number_of_ground_motion_fields = 10
 asset_hazard_distance = 50
 tectonic_region_type = Shallow Default
+aggregate_by = ID_1,OCCUPANCY

openquake/engine/tests/aristotle4/job.ini

@@ -10,3 +10,4 @@ maximum_distance = 600
 number_of_ground_motion_fields = 10
 asset_hazard_distance = 15
 tectonic_region_type = Active Shallow Crust
+aggregate_by = ID_1,OCCUPANCY

openquake/qa_tests_data/event_based_risk/case_1/expected/agg_keys.csv

@@ -1,8 +1,6 @@
-#,,,,,"generated_by='OpenQuake engine 3.22.0-gitda13fd23a5', start_date='2025-01-16T06:28:17', checksum=1040388326"
+#,,,,,"generated_by='OpenQuake engine 3.22.0-gitc08701244a', start_date='2025-01-17T06:03:23', checksum=1040388326"
 policy,taxonomy,number,nonstructural,structural,area
 A,RC,5.00000E+02,1.00000E+03,2.00000E+03,1.00000E+01
 A,RM,3.00000E+00,1.50000E+03,3.00000E+03,1.00000E+01
-A,W,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00
-B,RC,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00
 B,RM,1.00000E+01,2.50000E+03,5.00000E+03,1.00000E+00
 B,W,1.00000E+03,5.00000E+02,1.00000E+03,1.00000E+01