add quantreg option to reduce damages

Author: JMGilbert

src/dscim/menu/main_recipe.py

@@ -319,8 +319,9 @@ def scc():
             self.logger.info("Processing SCC calculation ...")
             if self.fit_type == "quantreg":
                 self.full_uncertainty_iqr
-                self.calculate_scc
-                self.stat_uncertainty_iqr
+                if len(self.fair_aggregation) > 0:
+                    self.calculate_scc
+                    self.stat_uncertainty_iqr
             else:
                 if len(self.fair_aggregation) > 0:
                     self.stream_discount_factors

src/dscim/preprocessing/preprocessing.py

@@ -21,6 +21,7 @@ def ce_from_chunk(
     zero,
     socioec,
     ce_batch_coords,
+    quantreg,
 ):
     year = chunk.year.values
     ssp = chunk.ssp.values
@@ -44,13 +45,19 @@ def ce_from_chunk(
         raise NotImplementedError("Pass 'cc' or 'no_cc' to reduction.")
 
     if recipe == "adding_up":
-        result = mean_func(
-            np.maximum(
-                calculation,
-                bottom_code,
-            ),
-            "batch",
-        )
+        if not quantreg:
+            result = mean_func(
+                np.maximum(
+                    calculation,
+                    bottom_code,
+                ),
+                "batch",
+            )
+        else:
+            result = np.maximum(
+                    calculation,
+                    bottom_code,
+            )
     elif recipe == "risk_aversion":
         result = ce_func(
             np.maximum(
@@ -73,6 +80,7 @@ def reduce_damages(
     socioec,
     bottom_coding_gdppc=39.39265060424805,
     zero=False,
+    quantreg=False,
 ):
     if recipe == "adding_up":
         assert (
@@ -112,10 +120,15 @@ def reduce_damages(
                     "model": 1,
                     "ssp": 1,
                 }
-
-            ce_batch_dims = [i for i in gdppc.dims] + [
-                i for i in ds.dims if i not in gdppc.dims and i != "batch"
-            ]
+            if quantreg:
+                chunkies['batch'] = 1
+                ce_batch_dims = [i for i in gdppc.dims] + [
+                    i for i in ds.dims if i not in gdppc.dims
+                ]
+            else:
+                ce_batch_dims = [i for i in gdppc.dims] + [
+                    i for i in ds.dims if i not in gdppc.dims and i != "batch"
+                ]
             ce_batch_coords = {c: ds[c].values for c in ce_batch_dims}
             ce_batch_coords["region"] = [
                 i for i in gdppc.region.values if i in ce_batch_coords["region"]
@@ -143,6 +156,7 @@ def reduce_damages(
             zero=zero,
             socioec=socioec,
             ce_batch_coords=ce_batch_coords,
+            quantreg=quantreg,
         ),
         template=template,
     )