Updated names to mean/median suffix (#351)

* updated names to mean/median suffix

* name updaet

* removed old vars

* centroid_lat to lat

Author: norlandrhagen

docs/methods/fire-risk/california-comparison.ipynb

@@ -509,9 +509,9 @@
     "    'bias': 'RPS bias (CP - WRC)',\n",
     "    'corr': 'Correlation',\n",
     "    'rps_2047_median': 'CP median RPS',\n",
-    "    'median_rps_scott': 'WRC median RPS',\n",
-    "    'mean_rps_2011': 'CP mean RPS',\n",
-    "    'mean_rps_scott': 'WRC mean RPS',\n",
+    "    'rps_scott_median': 'WRC median RPS',\n",
+    "    'rps_2011_mean': 'CP mean RPS',\n",
+    "    'rps_scott_mean': 'WRC mean RPS',\n",
     "    'normalized_bias': 'RPS normalized bias\\n((CP - WRC)/WRC)',\n",
     "}\n",
     "var_lims = {\n",

docs/methods/fire-risk/compare-risk-buildings.ipynb

@@ -394,9 +394,9 @@
     "    'bias': 'RPS bias (CP - Scott)',\n",
     "    'corr': 'Correlation (CP vs. Scott)',\n",
     "    'rps_2047_median': 'CP median RPS',\n",
-    "    'median_rps_scott': 'Scott median RPS',\n",
-    "    'mean_rps_2011': 'CP mean RPS',\n",
-    "    'mean_rps_scott': 'Scott mean RPS',\n",
+    "    'rps_scott_median': 'Scott median RPS',\n",
+    "    'rps_2011_mean': 'CP mean RPS',\n",
+    "    'rps_scott_mean': 'Scott mean RPS',\n",
     "    'normalized_bias': 'RPS normalized bias\\n((CP - Scott)/Scott)',\n",
     "}\n",
     "# limits to use for plotting the different performance metrics\n",
@@ -471,9 +471,9 @@
    "source": [
     "for variable in [\n",
     "    'rps_2047_median',\n",
-    "    'median_rps_scott',\n",
-    "    'mean_rps_2011',\n",
-    "    'mean_rps_scott',\n",
+    "    'rps_scott_median',\n",
+    "    'rps_2011_mean',\n",
+    "    'rps_scott_mean',\n",
     "]:\n",
     "    fig, axarr = plt.subplots(figsize=(14, 10))\n",
     "    states.plot(ax=axarr, color='white', edgecolor='black')\n",

ocr/pipeline/create_regional_pmtiles.py

@@ -74,8 +74,8 @@ def create_regional_pmtiles(
                     'Feature' AS type,
                     json_object(
                         '0', building_count,
-                        '1', mean_rps_2011,
-                        '2', mean_rps_2047,
+                        '1', rps_2011_mean,
+                        '2', rps_2047_mean,
                         '3', rps_2011_median,
                         '4', rps_2047_median,
                         '5', risk_score_2011_hist,
@@ -105,8 +105,8 @@ def create_regional_pmtiles(
                     'Feature' AS type,
                     json_object(
                         '0', building_count,
-                        '1', mean_rps_2011,
-                        '2', mean_rps_2047,
+                        '1', rps_2011_mean,
+                        '2', rps_2047_mean,
                         '3', rps_2011_median,
                         '4', rps_2047_median,
                         '5', risk_score_2011_hist,
@@ -136,8 +136,8 @@ def create_regional_pmtiles(
                     'Feature' AS type,
                     json_object(
                         '0', building_count,
-                        '1', mean_rps_2011,
-                        '2', mean_rps_2047,
+                        '1', rps_2011_mean,
+                        '2', rps_2047_mean,
                         '3', rps_2011_median,
                         '4', rps_2047_median,
                         '5', risk_score_2011_hist,
@@ -167,8 +167,8 @@ def create_regional_pmtiles(
                     'Feature' AS type,
                     json_object(
                         '0', building_count,
-                        '1', mean_rps_2011,
-                        '2', mean_rps_2047,
+                        '1', rps_2011_mean,
+                        '2', rps_2047_mean,
                         '3', rps_2011_median,
                         '4', rps_2047_median,
                         '5', risk_score_2011_hist,
@@ -199,8 +199,8 @@ def create_regional_pmtiles(
                     'Feature' AS type,
                     json_object(
                         '0', building_count,
-                        '1', mean_rps_2011,
-                        '2', mean_rps_2047,
+                        '1', rps_2011_mean,
+                        '2', rps_2047_mean,
                         '3', rps_2011_median,
                         '4', rps_2047_median,
                         '5', risk_score_2011_hist,

ocr/pipeline/fire_wind_risk_regional_aggregator.py

@@ -118,13 +118,13 @@ def custom_histogram_query(
         {name_column}
         count(b.GEOID) as building_count,
 
-        avg(a.rps_2011) as mean_rps_2011,
-        avg(a.rps_2047) as mean_rps_2047,
-        avg(a.bp_2011) as mean_bp_2011,
-        avg(a.bp_2047) as mean_bp_2047,
-        avg(a.crps_scott) as mean_crps_scott,
-        avg(a.bp_2011_riley) as mean_bp_2011_riley,
-        avg(a.bp_2047_riley) as mean_bp_2047_riley,
+        avg(a.rps_2011) as rps_2011_mean,
+        avg(a.rps_2047) as rps_2047_mean,
+        avg(a.bp_2011) as bp_2011_mean,
+        avg(a.bp_2047) as bp_2047_mean,
+        avg(a.crps_scott) as crps_scott_mean,
+        avg(a.bp_2011_riley) as bp_2011_riley_mean,
+        avg(a.bp_2047_riley) as bp_2047_riley_mean,
 
         median(a.rps_2011) as rps_2011_median,
         median(a.rps_2047) as rps_2047_median,
@@ -154,13 +154,13 @@ def custom_histogram_query(
         b.GEOID,
         {name_column}
         b.building_count,
-        b.mean_rps_2011,
-        b.mean_rps_2047,
-        b.mean_bp_2011,
-        b.mean_bp_2047,
-        b.mean_crps_scott,
-        b.mean_bp_2011_riley,
-        b.mean_bp_2047_riley,
+        b.rps_2011_mean,
+        b.rps_2047_mean,
+        b.bp_2011_mean,
+        b.bp_2047_mean,
+        b.crps_scott_mean,
+        b.bp_2011_riley_mean,
+        b.bp_2047_riley_mean,
         b.rps_2011_median,
         b.rps_2047_median,
         b.bp_2011_median,

ocr/pipeline/write_aggregated_region_analysis_files.py

@@ -40,7 +40,7 @@ def write_stats_table(
             bp_2047_mean,
             crps_scott_mean,
             bp_2011_riley_mean,
-            bp_2011_riley_mean,
+            bp_2047_riley_mean,
             rps_2011_median,
             rps_2047_median,
             bp_2011_median,
@@ -83,14 +83,7 @@ def write_stats_table(
                                 'bp_2047_median', bp_2047_median,
                                 'crps_scott_median', crps_scott_median,
                                 'bp_2011_riley_median', bp_2011_riley_median,
-                                'bp_2047_riley_median', bp_2047_riley_median,
-                                'wind_risk_2011_hist', wind_risk_2011_hist,
-                                'wind_risk_2047_hist', wind_risk_2047_hist,
-                                'burn_probability_2011_hist', burn_probability_2011_hist,
-                                'burn_probability_2047_hist', burn_probability_2047_hist,
-                                'conditional_risk_usfs_hist', conditional_risk_usfs_hist,
-                                'burn_probability_usfs_2011_hist', burn_probability_usfs_2011_hist,
-                                'burn_probability_usfs_2047_hist', burn_probability_usfs_2047_hist
+                                'bp_2047_riley_median', bp_2047_riley_median
                             ),
                             'geometry', json(ST_AsGeoJSON(geometry))
                         )
@@ -105,7 +98,7 @@ def write_stats_table(
 
     temp_csv_path = region_stats_path / 'stats_temp.csv'
     con.execute(
-        f"""COPY (SELECT * EXCLUDE (geometry, centroid_longitude, centroid_latitude) FROM {stats_table_name}) TO '{temp_csv_path}';"""
+        f"""COPY (SELECT * EXCLUDE (geometry, longitude, latitude) FROM {stats_table_name}) TO '{temp_csv_path}';"""
     )
 
     csv_content = temp_csv_path.read_text()