more percents -> fraction

EU4ToVic3/Source/V3World/EconomyManager/Demand/Market.cpp

@@ -186,7 +186,7 @@ std::map<std::string, double> V3::Market::estimateCulturalPrevalence(const std::
 {
 	auto culturalFactors = initCulturalFactors();
 
-	for (const auto& [culture, percent]: cultureData)
+	for (const auto& [culture, fraction]: cultureData)
 	{
 		const auto& taboos = getTaboos(culture, cultures, religions);
 		const auto& obsessions = getObsessions(culture, cultures);
@@ -197,15 +197,15 @@ std::map<std::string, double> V3::Market::estimateCulturalPrevalence(const std::
 			{
 				continue;
 			}
-			culturalFactors.at(taboo) -= percent;
+			culturalFactors.at(taboo) -= fraction;
 		}
 		for (const auto& obsession: obsessions)
 		{
 			if (!validateGood(obsession))
 			{
 				continue;
 			}
-			culturalFactors.at(obsession) += percent;
+			culturalFactors.at(obsession) += fraction;
 		}
 	}
 
@@ -281,8 +281,8 @@ double V3::Market::calcPurchaseWeight(double marketShare, const GoodsFulfillment
 	const double culturalFactor = calcCulturalFactor(culturalPrevalence);
 	if (culturalFactor > 1)
 	{
-		const double percent = culturalFactor - 1;
-		weight = std::max(weight, percent + (1 - percent) * weight); // (x * 1) + (1 - x)y
+		const double fraction = culturalFactor - 1;
+		weight = std::max(weight, fraction + (1 - fraction) * weight); // (x * 1) + (1 - x)y
 	}
 
 	return marketShare * weight * culturalFactor;
@@ -342,8 +342,7 @@ void V3::Market::calcPopOrders(const int popSize,
 	const auto& culturalPrevalence = estimateCulturalPrevalence(cultureData, cultures, religions);
 	const auto& goodsMap = demand.getGoodsMap();
 
-	// Assuming enough land for each pop (for now).
-	for (const auto& [job, jobPercent]: jobData)
+	for (const auto& [job, jobFraction]: jobData)
 	{
 		if (!popTypeMap.contains(job))
 		{
@@ -356,7 +355,7 @@ void V3::Market::calcPopOrders(const int popSize,
 		}
 		const auto& popType = popTypeMap.at(job);
 
-		const double popFactor = calcPopFactor(popSize * jobPercent, popType, defines, laws, lawsMap);
+		const double popFactor = calcPopFactor(popSize * jobFraction, popType, defines, laws, lawsMap);
 		const int wealth = estimateWealth(popType.getStrata());
 
 		if (!demand.getWealthConsumptionMap().contains(wealth))

EU4ToVic3/Source/V3World/EconomyManager/Demand/MarketTracker.cpp

@@ -114,14 +114,14 @@ void V3::MarketTracker::integrateBuilding(const Building& building,
 	BuildingResources subsistenceResources;
 	const Building& subsistenceBuilding = buildings.at(subState->getHomeState()->getSubsistenceBuilding());
 	subsistenceResources.evaluateResources(subsistenceBuilding.getPMGroups(), estimatedPMs, PMs, PMGroups);
-	const double addedWorkingPopPercent = Market::calcAddedWorkingPopFraction(subState->getOwner()->getProcessedData().laws, lawsMap);
+	const double addedWorkingPopFraction = Market::calcAddedWorkingPopFraction(subState->getOwner()->getProcessedData().laws, lawsMap);
 
 	// Track Jobs changed.
 	double lostSubsistence = marketJobs.createJobs(buildingResources.getJobs(),
 		 subsistenceResources.getJobs(),
 		 p,
 		 defaultRatio,
-		 addedWorkingPopPercent,
+		 addedWorkingPopFraction,
 		 estOwnershipFraction,
 		 {{
 				"building_financial_district",
@@ -153,7 +153,7 @@ void V3::MarketTracker::integrateBuilding(const Building& building,
 			 subsistenceResources.getJobs(),
 			 p * urbanFrac,
 			 defaultRatio,
-			 addedWorkingPopPercent,
+			 addedWorkingPopFraction,
 			 {},
 			 {},
 			 popTypes,
@@ -173,6 +173,7 @@ void V3::MarketTracker::logDebugMarket(const Country& country) const
 								<< "\nCulture Split:" << breakdownAsTable(marketCulture, 0).str();
 }
 
+// Debugging function
 std::stringstream V3::MarketTracker::breakdownAsTable(const std::map<std::string, double>& breakdown, const int popCount, const bool asPercent)
 {
 	std::stringstream out;