Merge branch 'develop' of https://github.com/remindmodel/remind into npi

remindmodel · Jun 30, 2023 · ca09cc0 · ca09cc0
2 parents ceb19fd + af701bd
commit ca09cc0
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/modules/29_CES_parameters/calibrate/preloop.gms b/modules/29_CES_parameters/calibrate/preloop.gms
@@ -1370,8 +1370,16 @@ loop ((t,regi_dyn29(regi),ue_industry_dyn37(out)),
   if (sm_tmp ne 1,
     loop (ue_industry_2_pf(out,ppfen_industry_dyn37(in)),
       put pm_cesdata.tn(t,regi,in,"price"),
-          @60 pm_cesdata(t,regi,in,"price"), " x ",
-          sm_tmp, " = ";
+          @60 pm_cesdata(t,regi,in,"price"), " x ";
+      if (abs(sm_tmp - 1) lt 1e-2,
+        if (sm_tmp gt 1,
+          put "(1 + ", (sm_tmp - 1), ") = ";
+        else
+          put "(1 - ", (1 - sm_tmp), ") = ";
+        );
+      else
+        put "     ", sm_tmp, "  = ";
+      );
 
       pm_cesdata(t,regi,in,"price")
       = pm_cesdata(t,regi,in,"price")