diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-07-19 21:35:31 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-07-19 21:35:31 +0200 |
| commit | d1f3a96b72dd06b5f97dd4643e5f016a02b42ea6 (patch) | |
| tree | 38015e5729afbb98cf520e2cf26d8a4623d32f2f /src/openvic-simulation/economy | |
| parent | e0518bee9b4c164f40716a8033b5e207c2060c0b (diff) | |
| parent | 03647d2249f72b6545628bb844685f87c4581062 (diff) | |
Merge pull request #176 from OpenVicProject/format-cleanup
Cleanup: inheritance, const movable variables, code formatting
Diffstat (limited to 'src/openvic-simulation/economy')
| -rw-r--r-- | src/openvic-simulation/economy/ResourceGatheringOperation.cpp | 25 | ||||
| -rw-r--r-- | src/openvic-simulation/economy/ResourceGatheringOperation.hpp | 11 |
2 files changed, 22 insertions, 14 deletions
diff --git a/src/openvic-simulation/economy/ResourceGatheringOperation.cpp b/src/openvic-simulation/economy/ResourceGatheringOperation.cpp index 19bce2d..9bf6f49 100644 --- a/src/openvic-simulation/economy/ResourceGatheringOperation.cpp +++ b/src/openvic-simulation/economy/ResourceGatheringOperation.cpp @@ -3,14 +3,19 @@ using namespace OpenVic; ResourceGatheringOperation::ResourceGatheringOperation( - ProductionType const& new_production_type, const fixed_point_t new_size_multiplier, - const fixed_point_t new_revenue_yesterday, const fixed_point_t new_output_quantity_yesterday, - const fixed_point_t new_unsold_quantity_yesterday, ordered_map<Pop*, Pop::pop_size_t>&& new_employees -) - : production_type { new_production_type }, revenue_yesterday { new_revenue_yesterday }, - output_quantity_yesterday { new_output_quantity_yesterday }, unsold_quantity_yesterday { new_unsold_quantity_yesterday }, - size_multiplier { new_size_multiplier }, employees { std::move(new_employees) } {} + ProductionType const& new_production_type, + fixed_point_t new_size_multiplier, + fixed_point_t new_revenue_yesterday, + fixed_point_t new_output_quantity_yesterday, + fixed_point_t new_unsold_quantity_yesterday, + ordered_map<Pop*, Pop::pop_size_t>&& new_employees +) : production_type { new_production_type }, + revenue_yesterday { new_revenue_yesterday }, + output_quantity_yesterday { new_output_quantity_yesterday }, + unsold_quantity_yesterday { new_unsold_quantity_yesterday }, + size_multiplier { new_size_multiplier }, + employees { std::move(new_employees) } {} + ResourceGatheringOperation::ResourceGatheringOperation( - ProductionType const& new_production_type, const fixed_point_t new_size_multiplier -) - : ResourceGatheringOperation(new_production_type, new_size_multiplier, 0, 0, 0, {}) {} + ProductionType const& new_production_type, fixed_point_t new_size_multiplier +) : ResourceGatheringOperation { new_production_type, new_size_multiplier, 0, 0, 0, {} } {} diff --git a/src/openvic-simulation/economy/ResourceGatheringOperation.hpp b/src/openvic-simulation/economy/ResourceGatheringOperation.hpp index 4855a30..73b4261 100644 --- a/src/openvic-simulation/economy/ResourceGatheringOperation.hpp +++ b/src/openvic-simulation/economy/ResourceGatheringOperation.hpp @@ -16,10 +16,13 @@ namespace OpenVic { public: ResourceGatheringOperation( - ProductionType const& new_production_type, const fixed_point_t new_size_multiplier, - const fixed_point_t new_revenue_yesterday, const fixed_point_t new_output_quantity_yesterday, - const fixed_point_t new_unsold_quantity_yesterday, ordered_map<Pop*, Pop::pop_size_t>&& new_employees + ProductionType const& new_production_type, + fixed_point_t new_size_multiplier, + fixed_point_t new_revenue_yesterday, + fixed_point_t new_output_quantity_yesterday, + fixed_point_t new_unsold_quantity_yesterday, + ordered_map<Pop*, Pop::pop_size_t>&& new_employees ); - ResourceGatheringOperation(ProductionType const& new_production_type, const fixed_point_t new_size_multiplier); + ResourceGatheringOperation(ProductionType const& new_production_type, fixed_point_t new_size_multiplier); }; } |