update to ignore .nc files

Author: hyunjimoon

.gitignore

@@ -2,8 +2,9 @@
 .Rhistory
 .RData
 .Ruserdata
-*.vdfx
+**/*.vdfx
 **/*.vmfx
+**/*.nc
 .apps
 *.pkl
 **/*.hpp
@@ -19,4 +20,4 @@ build/
 venv/
 .png
 **/.DS_Store
-.idea/
+.idea/

stanify/calibrator/draws_data_mapper.py

@@ -148,7 +148,7 @@ def transform_input(vensim, setting, precision, numeric, prior, output_format):
     ## precision for both draws2data and data2draws
     precision['Q'] = len(setting['target_simulated_vector_names'])
 
-    setting['model_name'] = setting['model_name'] + f'_S{precision["S"]}N{precision["N"]}R{precision["R"]}_M{precision["M"]}'
+    setting['model_name'] = setting['model_name'] + f'_S{precision["S"]}N{precision["N"]}Q{precision["Q"]}R{precision["R"]}_M{precision["M"]}_ps{numeric["process_noise_scale"]}'
 
     # obs vectors match draws2data and data2draws
     numeric_setting = dict(**numeric)

stanify/calibrator/visualizer.py

@@ -20,7 +20,7 @@
 
 def save_fig(model_name, is_draws2data, plot_name):
     plot_path = get_plot_path(model_name)
-    fig_name = f"{plot_path}/{plot_name}"
+    fig_name = f"{plot_path}/{model_name}_{plot_name}"
     if is_draws2data:
         fig_name = fig_name + "_draws2data"
     else:
@@ -32,6 +32,7 @@ def plot_qoi(sbc_precision, setting, precision, idata_kwargs, model_name):
     #sbc = xr.open_dataset(f"{data_path}/sbc.nc")
     sbc = sbc_precision
     figsize = (30, 15)
+    # TODO @Oriol how to replace to_dataframe?  values?
     if precision['R'] > 1:
         sbc.observed_data.to_dataframe()[idata_kwargs['prior_predictive']].plot(by='region', figsize = figsize)
     else: