Merge pull request #846 from jdebacker/txfunc_fix

Merging
PSLmodels · Jan 21, 2023 · 8b374ce · 8b374ce
2 parents 1ac812b + b65cf01
commit 8b374ce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/ogcore/parameter_plots.py b/ogcore/parameter_plots.py
@@ -1118,8 +1118,14 @@ def plot_2D_taxfunc(
     # get tax rates for each point in the income support and plot
     fig, ax = plt.subplots()
     for i, tax_params in enumerate(tax_param_list):
+        if tax_func_type[i] == "mono":
+            tax_params = tax_params[rate_key][s][t][0]
+        else:
+            tax_param_array = np.array(tax_params[rate_key])
+            tax_params = tax_param_array[s, t, :]
         rates = txfunc.get_tax_rates(
-            tax_params[rate_key][s, t, :],
+            # tax_params[rate_key][s, t, :],
+            tax_params,
             X,
             Y,
             None,

diff --git a/ogcore/txfunc.py b/ogcore/txfunc.py
@@ -1183,10 +1183,9 @@ def tax_func_loop(
                     ] = lin_int_mtry[s_ind, :]
 
             elif (
-                NoData_cnt
-                > 0 & NoData_cnt
-                < s - s_min & tax_func_type
-                == "mono"
+                (NoData_cnt > 0)
+                & (NoData_cnt < s - s_min)
+                & (tax_func_type == "mono")
             ):
                 # '''
                 # -------------------------------------------------------------