Bump extension/deps/openvic-simulation from 47be603 to 4bc9c5b#674
Bump extension/deps/openvic-simulation from 47be603 to 4bc9c5b#674dependabot[bot] wants to merge 1 commit into
47be603 to 4bc9c5b#674Conversation
dependabot
Bot
added
dependencies
dependabot
Bot
added
dependencies
wvpm
force-pushed
the
dependabot/submodules/extension/deps/openvic-simulation-4bc9c5b
branch
3 times, most recently
from
add7015 to
812e331
Compare
| case SORT_ISSUES: | ||
| return [](Pop const& a, Pop const& b) -> bool { | ||
| return sorted_fixed_map_less_than(a.get_supporter_equivalents_by_issue(), b.get_supporter_equivalents_by_issue()); | ||
| return a.id_in_province < b.id_in_province; |
There was a problem hiding this comment.
We still need to figure out how to do this efficiently.
There was a problem hiding this comment.
I can't even find the Vic2 logic here.
The best I can for sure is that 1st click sorts ascending, 2nd click descending.
When descending, reforms come first. Otherwise party issues come first.
How they sort inside of that, no clue.
There was a problem hiding this comment.
I implemented a simple version that compares the index of the largest issue and then compares the support for that issue. It lacks a tie breaker.
| sorted_distribution.begin(), sorted_distribution.end(), | ||
| [](entry_t const& lhs, entry_t const& rhs) -> bool { | ||
| return lhs.first < rhs.first; | ||
| return lhs.first.get().get_identifier() < rhs.first.get().get_identifier(); |
There was a problem hiding this comment.
What was the original logic here?
Pointer sorting?
I don't think all values had an index to sort by.
wvpm
force-pushed
the
dependabot/submodules/extension/deps/openvic-simulation-4bc9c5b
branch
8 times, most recently
from
1953dc9 to
3bf7d6c
Compare
Bumps [extension/deps/openvic-simulation](https://github.com/OpenVicProject/OpenVic-Simulation) from `47be603` to `4bc9c5b`. - [Commits](OpenVicProject/OpenVic-Simulation@47be603...4bc9c5b) --- updated-dependencies: - dependency-name: extension/deps/openvic-simulation dependency-version: 4bc9c5b035d55ce1fce68e1e59734e3742a853e0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
wvpm
force-pushed
the
dependabot/submodules/extension/deps/openvic-simulation-4bc9c5b
branch
from
3bf7d6c to
1237390
Compare
| Windows note: doctool may not work in powershell/vscode terminal use command prompt directly. | ||
|
|
There was a problem hiding this comment.
This should be in a separate PR
| unescape_keys=false | ||
| unescape_translations=true |
There was a problem hiding this comment.
This should be in a separate PR.
| SaveManager="*res://src/Autoload/SaveManager.gd" | ||
| CursorManager="*res://src/Autoload/CursorManager.gd" | ||
| Keychain="*uid://ba4bw6vqtoail" | ||
| Keychain="*uid://dgiia2xg7fsud" |
There was a problem hiding this comment.
This should be a separate PR, if the dependabot branch doesn't export as result of this, the PR fixing this should be merged first and then this PR rebased onto master.
| value = static_cast<float>(non_float_value); | ||
| } | ||
| for (size_t i = 0; i < keys.size(); ++i) { | ||
| key_t key = as_reference_wrapper(keys[i]); |
There was a problem hiding this comment.
Why does this need to be a reference_wrapper?
|
|
||
| for (auto [key_ref_or_ptr, weight] : distribution) { | ||
| for (size_t i = 0; i < keys.size(); ++i) { | ||
| key_t key = as_reference_wrapper(keys[i]); |
There was a problem hiding this comment.
Why does this need to be a reference_wrapper?
2 participants
Bumps extension/deps/openvic-simulation from
47be603to4bc9c5b.Commits
4bc9c5bMerge pull request #737 from OpenVicProject/typed_fixed_vectoredbe490FixedVector size_type as template argument4f7789aMerge pull request #745 from OpenVicProject/fix/clang-format-header-ordered6c198Add missing dependencies to IncludeCategoriesf6c94ddMerge pull request #743 from OpenVicProject/bugfix_infra_mapmode9e08ce9Bugfix infra mapmoded3843feMerge pull request #734 from OpenVicProject/optimise_pops_aggregate_via_indexing3d53f45Optimise PopsAggregate by using IndexedFlatMaps for party policies and reformsddb4db3Merge pull request #740 from OpenVicProject/accept_small_pop_truncation368d1faAccept truncations in pops smaller than 16Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)