remindmodel / remind

REMIND - REgional Model of INvestments and Development
Other
93 stars 123 forks source link

harden nash against spurious consecutive failures #1604

Closed 0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q closed 4 months ago

0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q commented 4 months ago

Checklist:

robertpietzcker commented 4 months ago

I actually noticed the same thing last week and changed the code a bit more fundamentally, also adding some output of time used during the various loops (https://github.com/robertpietzcker/remind/tree/202403_improveNashOutput). If it is ok with you, I would rather prefer NOT to merge your version but rather go the full step directly (I will prepare the PR in an hour or so, I wanted to test it over the weekend before making the PR) so I don't have to change my code to include your changes (which are part of my changes, but in a slightly different way)?

0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q commented 4 months ago

I would opt for separating bug fixes (this) and new features (printing timestamps).

robertpietzcker commented 4 months ago

ok, no problem, I can take split my PR and take the "printing time steps" out of the first PR; it is just that I added a split of p80_repy into "what happened in the current loop of solitr" and "what happened until now in this solitr loop", which both solves the wrong code (that you saw and also fixed) and allows more precise information on what is happening in the model.

robertpietzcker commented 4 months ago

sorry, alles zu voll. mach erstmal so, und ich pack dann meine Ă„nderungen danach dazu