Merge pull request #200 from OpenVicProject/move_production_to_folder

Move production types to economy/production/

10 files changed, 20 insertions, 33 deletions

diff --git a/src/openvic-simulation/economy/BuildingType.hpp b/src/openvic-simulation/economy/BuildingType.hpp
index ab999cd..e28dd86 100644
--- a/src/openvic-simulation/economy/BuildingType.hpp
+++ b/src/openvic-simulation/economy/BuildingType.hpp
@@ -1,12 +1,13 @@
 #pragma once
 
-#include "openvic-simulation/misc/Modifier.hpp"
 #include "openvic-simulation/economy/GoodDefinition.hpp"
-#include "openvic-simulation/economy/ProductionType.hpp"
+#include "openvic-simulation/economy/production/ProductionType.hpp"
+#include "openvic-simulation/misc/Modifier.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
+
 namespace OpenVic {
 
 	struct BuildingTypeManager;
diff --git a/src/openvic-simulation/economy/EconomyManager.hpp b/src/openvic-simulation/economy/EconomyManager.hpp
index 2464912..7f0520d 100644
--- a/src/openvic-simulation/economy/EconomyManager.hpp
+++ b/src/openvic-simulation/economy/EconomyManager.hpp
@@ -2,9 +2,11 @@
 
 #include "openvic-simulation/economy/BuildingType.hpp"
 #include "openvic-simulation/economy/GoodDefinition.hpp"
-#include "openvic-simulation/economy/ProductionType.hpp"
+#include "openvic-simulation/economy/production/ProductionType.hpp"
+
 #include "openvic-dataloader/v2script/Parser.hpp"
 
+
 namespace OpenVic {
 	struct EconomyManager {
 	private:
diff --git a/src/openvic-simulation/economy/ArtisanalProducer.cpp b/src/openvic-simulation/economy/production/ArtisanalProducer.cpp
index d5cc3d3..d5cc3d3 100644
--- a/src/openvic-simulation/economy/ArtisanalProducer.cpp
+++ b/src/openvic-simulation/economy/production/ArtisanalProducer.cpp
diff --git a/src/openvic-simulation/economy/ArtisanalProducer.hpp b/src/openvic-simulation/economy/production/ArtisanalProducer.hpp
index ed5b231..e5c0b80 100644
--- a/src/openvic-simulation/economy/ArtisanalProducer.hpp
+++ b/src/openvic-simulation/economy/production/ArtisanalProducer.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "openvic-simulation/economy/GoodDefinition.hpp"
-#include "openvic-simulation/economy/ProductionType.hpp"
+#include "openvic-simulation/economy/production/ProductionType.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
@@ -15,10 +15,8 @@ namespace OpenVic {
 
 	public:
 		ArtisanalProducer(
-			ProductionType const& new_production_type,
-			GoodDefinition::good_definition_map_t&& new_stockpile,
-			fixed_point_t new_current_production,
-			GoodDefinition::good_definition_map_t&& new_current_needs
+			ProductionType const& new_production_type, GoodDefinition::good_definition_map_t&& new_stockpile,
+			fixed_point_t new_current_production, GoodDefinition::good_definition_map_t&& new_current_needs
 		);
 	};
 }
diff --git a/src/openvic-simulation/economy/FactoryProducer.cpp b/src/openvic-simulation/economy/production/FactoryProducer.cpp
index 2ef9fa8..2ef9fa8 100644
--- a/src/openvic-simulation/economy/FactoryProducer.cpp
+++ b/src/openvic-simulation/economy/production/FactoryProducer.cpp
diff --git a/src/openvic-simulation/economy/FactoryProducer.hpp b/src/openvic-simulation/economy/production/FactoryProducer.hpp
index ee658a5..54ddfb8 100644
--- a/src/openvic-simulation/economy/FactoryProducer.hpp
+++ b/src/openvic-simulation/economy/production/FactoryProducer.hpp
@@ -3,7 +3,7 @@
 #include <cstdint>
 
 #include "openvic-simulation/economy/GoodDefinition.hpp"
-#include "openvic-simulation/economy/ProductionType.hpp"
+#include "openvic-simulation/economy/production/ProductionType.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
@@ -34,24 +34,13 @@ namespace OpenVic {
 
 	public:
 		FactoryProducer(
-			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,
-			GoodDefinition::good_definition_map_t&& new_stockpile,
-			fixed_point_t new_budget,
-			fixed_point_t new_balance_yesterday,
-			fixed_point_t new_received_investments_yesterday,
-			fixed_point_t new_market_spendings_yesterday,
-			fixed_point_t new_paychecks_yesterday,
-			uint32_t new_unprofitable_days,
-			uint32_t new_subsidised_days,
-			uint32_t new_days_without_input,
-			uint8_t new_hiring_priority,
-			uint8_t new_profit_history_current,
-			daily_profit_history_t&& new_daily_profit_history
+			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, GoodDefinition::good_definition_map_t&& new_stockpile,
+			fixed_point_t new_budget, fixed_point_t new_balance_yesterday, fixed_point_t new_received_investments_yesterday,
+			fixed_point_t new_market_spendings_yesterday, fixed_point_t new_paychecks_yesterday, uint32_t new_unprofitable_days,
+			uint32_t new_subsidised_days, uint32_t new_days_without_input, uint8_t new_hiring_priority,
+			uint8_t new_profit_history_current, daily_profit_history_t&& new_daily_profit_history
 		);
 		FactoryProducer(ProductionType const& new_production_type, fixed_point_t new_size_multiplier);
 
diff --git a/src/openvic-simulation/economy/ProductionType.cpp b/src/openvic-simulation/economy/production/ProductionType.cpp
index 65f3eba..65f3eba 100644
--- a/src/openvic-simulation/economy/ProductionType.cpp
+++ b/src/openvic-simulation/economy/production/ProductionType.cpp
diff --git a/src/openvic-simulation/economy/ProductionType.hpp b/src/openvic-simulation/economy/production/ProductionType.hpp
index 5394938..5394938 100644
--- a/src/openvic-simulation/economy/ProductionType.hpp
+++ b/src/openvic-simulation/economy/production/ProductionType.hpp
diff --git a/src/openvic-simulation/economy/ResourceGatheringOperation.cpp b/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp
index 9bf6f49..9bf6f49 100644
--- a/src/openvic-simulation/economy/ResourceGatheringOperation.cpp
+++ b/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp
diff --git a/src/openvic-simulation/economy/ResourceGatheringOperation.hpp b/src/openvic-simulation/economy/production/ResourceGatheringOperation.hpp
index 73b4261..d71c569 100644
--- a/src/openvic-simulation/economy/ResourceGatheringOperation.hpp
+++ b/src/openvic-simulation/economy/production/ResourceGatheringOperation.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "openvic-simulation/economy/ProductionType.hpp"
+#include "openvic-simulation/economy/production/ProductionType.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
@@ -16,11 +16,8 @@ namespace OpenVic {
 
 	public:
 		ResourceGatheringOperation(
-			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,
+			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, fixed_point_t new_size_multiplier);