Use new Supplier-based jasmine API - #503
Conversation
07d1ab7 to
7156b8b
Compare
|
@dav-sonn This PR is now shaping up and I'm not expecting it to see much more changes. This is not ready to merge yet as I still need to release a new version of jasmine and plug this branch on that new version. However, since it already has all the changes I wanted to make for now, it would be extremely helpful if you could test the GUI on your end and check that it behaves appropriately (essentially that the values being plotted look reasonable). The bulk of the changes in this PR is essentially rewriting the way cross-sections are done and plotted in |
Hi @amorison,
On IntelliJ, it shows the following error:
I didn't investigate any of these errors further - I just thought of sharing this right away with you. Please let me know if there's anything you want me to double-check (or fix). |
|
Well, that's the error I run into on |
Fair point. I never use the model through the GUI, so I hadn't noticed it at all, but in fact the same error appears in |
@amorison: after scraping all the latest commits, I found that the error was introduced in your PR #496, merged on 8 July.
I don't know whether this is the neatest way, though. Also, while I could run the model with the GUI, I still got repeated errors like Anyway, you certainly know better what the best solution is, so feel free to disregard my suggestions. Just let me know when you fixed this, so I can get back to reviewing the present PR (#503). Thank you! |
Fix by David Sonnewald, see #503
|
@dav-sonn Thanks for looking into this. Your fix seems to work for now on this branch, with the warnings you saw on |
Fix by David Sonnewald, see #503
3c17f1a to
01ecaeb
Compare
|
@dav-sonn Seems like everything is fixed now, the missing validation data on some plots was just a silly mistake on my part. From what I could tell, the GUI behaves the same as on the This is ready for review (although still not for merging as I still have to release a new version of jasmine and point to it before merging). |
de6af14 to
01ecaeb
Compare
|
@dav-sonn I had rebased this PR, please do not merge your local copy in this branch as this will result in duplicated commits. You can delete your local version of the branch before checking out the freshly fetched remote one to avoid merging outdated commits back in the PR. |
@amorison: I confirm everything works smoothly now. I still get the |
Fix by David Sonnewald, see #503
01ecaeb to
ad3459a
Compare
Fix by David Sonnewald, see #503
Existing filters that can be replaced by composing `Filters` predicates are marked for removal.
This was testing jasmine directly (i.e. the implementation of `EmploymentStatistics` provided it didn't fall out of sync) rather than `EmploymentStatistics` itself.
The wrapping `AccumulatorStats` is unnecessary as we're only interested in the last value.
ad3459a to
ce54bbc
Compare




Do not merge yet, this is still a work-in-progress.
This PR leverages the new
Supplier-based API ofjasmine-coreto extract cross-sections and statistics.This is a first major step in the direction of eliminating the need for the
I*Source-based API (which in turns is responsible for gigantic switch statements and enums growing in the codebase when implementing thoseSourceinterfaces). This PR already eliminates the switch statement inValidator, replaced by directly using methods inParametersto access the validation values.Regressors still use the
I*SourceAPI as some more work is needed injasmine-coreto port those to aSupplier-based API. Porting regressors to this newer API will be the object of incoming PRs in jasmine and simpaths.fGiniEquivalisedHouseholdDisposableIncomeNationaland other similarAccumulatorStatsSimPathsObserver(possibly in a follow-up PR)*SourceAPI