-
-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
220 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 133 additions & 4 deletions
137
EU4ToVic3/Source/V3World/EconomyManager/Demand/MarketTracker.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,143 @@ | ||
| #include "MarketTracker.h" | ||
| #include "ClayManager/State/State.h" | ||
| #include "ClayManager/State/SubState.h" | ||
|
|
||
| V3::MarketTracker::MarketTracker(const std::vector<std::string>& possibleGoods, | ||
| const std::vector<std::pair<std::string, int>>& manorHouseRoster) | ||
| V3::MarketTracker::MarketTracker(const std::map<std::string, Good>& possibleGoods, | ||
| const std::set<std::string>& manorHousePMGroups, | ||
| const std::map<std::string, ProductionMethodGroup>& PMGroups, | ||
| const std::map<std::string, ProductionMethod>& PMs) | ||
| { | ||
| market = Market(possibleGoods); | ||
| marketJobs = MarketJobs({}, manorHouseRoster); | ||
| market.loadGoods(possibleGoods); | ||
| std::map<std::string, int> manorHouseEmployment; | ||
| for (const auto& pmg: manorHousePMGroups) | ||
| { | ||
| for (const auto& [job, amount]: PMs.at(PMGroups.at(pmg).getPMs()[0]).getEmployment()) | ||
| { | ||
| manorHouseEmployment[job] = amount; | ||
| } | ||
| } | ||
| std::vector<std::pair<std::string, int>> mhr; | ||
| for (const auto& pair: manorHouseEmployment) | ||
| { | ||
| mhr.push_back(pair); | ||
| } | ||
| marketJobs = MarketJobs(mhr); | ||
| } | ||
|
|
||
| void V3::MarketTracker::resetMarket() | ||
| { | ||
| market.clearMarket(); | ||
| marketJobs.clearJobs(); | ||
| marketCulture.clear(); | ||
| } | ||
|
|
||
| void V3::MarketTracker::loadPeasants(const Country& country, | ||
| const std::map<std::string, ProductionMethodGroup>& PMGroups, | ||
| const std::map<std::string, ProductionMethod>& PMs, | ||
| const std::map<std::string, Building>& buildings, | ||
| const std::map<std::string, Law>& lawsMap) | ||
| { | ||
| // For each state check peasant PM | ||
| // from PM calc Jobs per arable land | ||
| // multiply Unit Jobs per filled arable land | ||
| // load in jobs | ||
| // "unemployed" for all who don't fit on the arable land | ||
|
|
||
| for (const auto& subState: country.getSubStates()) | ||
| { | ||
| const std::string& subsistenceBuildingName = subState->getHomeState()->getSubsistenceBuilding(); | ||
| if (const auto& subsistenceBuildingIter = buildings.find(subsistenceBuildingName); subsistenceBuildingIter != buildings.end()) | ||
| { | ||
| std::map<std::string, double> subsistenceEmployment; | ||
| double total = 0; | ||
|
|
||
| const auto& subsistenceBuilding = subsistenceBuildingIter->second; | ||
| for (const auto& PMg: subsistenceBuilding.getPMGroups()) | ||
| { | ||
| const auto& PMName = PMGroups.at(PMg).getPMs()[getPMAllowedByLaws(PMg, country.getProcessedData().laws, PMGroups, PMs)]; | ||
| const auto& thePM = PMs.at(PMName); | ||
| for (const auto& [job, amount]: thePM.getEmployment()) // TODO(Gawquon) Note that we still need to add the market goods for subsistence farms | ||
| { | ||
| subsistenceEmployment[job] += amount; | ||
| total += amount; | ||
| } | ||
| } | ||
|
|
||
| int peasantsPerLevel = subsistenceEmployment.at("peasants"); // TODO validate | ||
| // TODO (stuff) | ||
|
|
||
| marketJobs.loadInitialJobs() | ||
| // Create the Unit Employment by accounting for subsistence farm size and manor house stuff. | ||
| // Employ people base on ratios in unit employment untill arabe land is filled | ||
| // the rest are unemployed, | ||
| } | ||
| else | ||
| { | ||
| Log(LogLevel::Warning) << "Subsistence Building: " << subsistenceBuildingName << " has no definition."; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void V3::MarketTracker::updatePopNeeds(const Vic3DefinesLoader& defines, | ||
| const DemandLoader& demandDefines, | ||
| const std::set<std::string>& laws, | ||
| const std::map<std::string, PopType>& popTypes, | ||
| const std::map<std::string, mappers::CultureDef>& cultures, | ||
| const std::map<std::string, mappers::ReligionDef>& religions, | ||
| const std::map<std::string, Law>& lawsMap) | ||
| { | ||
| market.calcPopOrders(marketJobs.getPop(), marketJobs.getJobBreakdown(), marketCulture, defines, demandDefines, popTypes, cultures, religions, laws, lawsMap); | ||
| } | ||
|
|
||
| int V3::MarketTracker::getPMAllowedByLaws(const std::string& PMGroup, | ||
| const std::set<std::string>& laws, | ||
| const std::map<std::string, ProductionMethodGroup>& PMGroups, | ||
| const std::map<std::string, ProductionMethod>& PMs) const | ||
| { | ||
| const auto& groupPMs = PMGroups.at(PMGroup).getPMs(); | ||
|
|
||
| // Validate every PM in group | ||
| for (const auto& PM: groupPMs) | ||
| { | ||
| if (!PMs.contains(PM)) | ||
| { | ||
| Log(LogLevel::Error) << "Unknown PM: " << PM << "."; | ||
| return 0; | ||
| } | ||
| } | ||
|
|
||
| // Walk the group | ||
| int pick = 0; | ||
| for (const auto& PM: groupPMs) | ||
| { | ||
| const auto& thePM = PMs.at(PM); | ||
| if (hasUnlockingLaws(laws, thePM.getUnlockingLaws()) && !hasBlockingLaws(laws, thePM.getBlockingLaws())) | ||
| return std::max(pick - 1, 0); | ||
| ++pick; | ||
| } | ||
| return std::max(pick - 1, 0); | ||
| } | ||
|
|
||
| bool V3::MarketTracker::hasUnlockingLaws(const std::set<std::string>& laws, const std::set<std::string>& targetLaws) const | ||
| { | ||
| if (targetLaws.empty()) | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| return std::ranges::any_of(targetLaws, [laws](const std::string& targetLaw) { | ||
| return laws.contains(targetLaw); | ||
| }); | ||
| } | ||
|
|
||
| bool V3::MarketTracker::hasBlockingLaws(const std::set<std::string>& laws, const std::set<std::string>& targetLaws) const | ||
| { | ||
| if (targetLaws.empty()) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| return std::ranges::any_of(targetLaws, [laws](const std::string& targetLaw) { | ||
| return laws.contains(targetLaw); | ||
| }); | ||
| } |
42 changes: 33 additions & 9 deletions
42
EU4ToVic3/Source/V3World/EconomyManager/Demand/MarketTracker.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.