Merge pull request #11 from OpenVicProject/string_view

Changed IdentifierRegistry to use std::string_view when looking up a std::string key

1 files changed, 25 insertions, 16 deletions

diff --git a/src/openvic/pop/Pop.cpp b/src/openvic/pop/Pop.cpp
index 913d31f..c4b11b8 100644
--- a/src/openvic/pop/Pop.cpp
+++ b/src/openvic/pop/Pop.cpp
@@ -31,7 +31,7 @@ Pop::pop_size_t Pop::get_size() const {
 	return size;
 }
 
-PopType::PopType(std::string const& new_identifier, colour_t new_colour,
+PopType::PopType(const std::string_view new_identifier, colour_t new_colour,
 	strata_t new_strata, sprite_t new_sprite,
 	Pop::pop_size_t new_max_size, Pop::pop_size_t new_merge_max_size,
 	bool new_state_capital_only, bool new_demote_migrant, bool new_is_artisan, bool new_is_slave)
@@ -77,30 +77,39 @@ bool PopType::get_is_slave() const {
 	return is_slave;
 }
 
+static const std::string test_graphical_culture_type = "test_graphical_culture_type";
+static const std::string test_culture_group = "test_culture_group";
+static const std::string test_culture = "test_culture";
+static const std::string test_religion_group = "test_religion_group";
+static const std::string test_religion = "test_religion";
+static const std::string test_pop_type_poor = "test_pop_type_poor";
+static const std::string test_pop_type_middle = "test_pop_type_middle";
+static const std::string test_pop_type_rich = "test_pop_type_rich";
+
 PopManager::PopManager() : pop_types { "pop types" } {
-	culture_manager.add_graphical_culture_type("test_graphical_culture_type");
+	culture_manager.add_graphical_culture_type(test_graphical_culture_type);
 	culture_manager.lock_graphical_culture_types();
 
-	culture_manager.add_culture_group("test_culture_group", culture_manager.get_graphical_culture_type_by_identifier("test_graphical_culture_type"));
+	culture_manager.add_culture_group(test_culture_group, culture_manager.get_graphical_culture_type_by_identifier(test_graphical_culture_type));
 	culture_manager.lock_culture_groups();
 
-	culture_manager.add_culture("test_culture", 0x0000FF, culture_manager.get_culture_group_by_identifier("test_culture_group"),
+	culture_manager.add_culture(test_culture, 0x0000FF, culture_manager.get_culture_group_by_identifier(test_culture_group),
 		{ "john" }, { "smith" });
 	culture_manager.lock_cultures();
 
-	religion_manager.add_religion_group("test_religion_group");
+	religion_manager.add_religion_group(test_religion_group);
 	religion_manager.lock_religion_groups();
 
-	religion_manager.add_religion("test_religion", 0xFF0000, religion_manager.get_religion_group_by_identifier("test_religion_group"), 1, false);
+	religion_manager.add_religion(test_religion, 0xFF0000, religion_manager.get_religion_group_by_identifier(test_religion_group), 1, false);
 	religion_manager.lock_religions();
 
-	add_pop_type("test_pop_type_poor", 0xFF0000, PopType::strata_t::POOR, 1, 1, 1, false, false, false, false);
-	add_pop_type("test_pop_type_middle", 0x00FF00, PopType::strata_t::MIDDLE, 1, 1, 1, false, false, false, false);
-	add_pop_type("test_pop_type_rich", 0x0000FF, PopType::strata_t::RICH, 1, 1, 1, false, false, false, false);
+	add_pop_type(test_pop_type_poor, 0xFF0000, PopType::strata_t::POOR, 1, 1, 1, false, false, false, false);
+	add_pop_type(test_pop_type_middle, 0x00FF00, PopType::strata_t::MIDDLE, 1, 1, 1, false, false, false, false);
+	add_pop_type(test_pop_type_rich, 0x0000FF, PopType::strata_t::RICH, 1, 1, 1, false, false, false, false);
 	lock_pop_types();
 }
 
-return_t PopManager::add_pop_type(std::string const& identifier, colour_t colour, PopType::strata_t strata, PopType::sprite_t sprite,
+return_t PopManager::add_pop_type(const std::string_view identifier, colour_t colour, PopType::strata_t strata, PopType::sprite_t sprite,
 	Pop::pop_size_t max_size, Pop::pop_size_t merge_max_size, bool state_capital_only, bool demote_migrant, bool is_artisan, bool is_slave) {
 	if (identifier.empty()) {
 		Logger::error("Invalid pop type identifier - empty!");
@@ -129,17 +138,17 @@ void PopManager::lock_pop_types() {
 	pop_types.lock();
 }
 
-PopType const* PopManager::get_pop_type_by_identifier(std::string const& identifier) const {
+PopType const* PopManager::get_pop_type_by_identifier(const std::string_view identifier) const {
 	return pop_types.get_item_by_identifier(identifier);
 }
 
 void PopManager::generate_test_pops(Province& province) const {
 	if (pop_types.is_locked()) {
-		static PopType const& type_poor = *get_pop_type_by_identifier("test_pop_type_poor");
-		static PopType const& type_middle = *get_pop_type_by_identifier("test_pop_type_middle");
-		static PopType const& type_rich = *get_pop_type_by_identifier("test_pop_type_rich");
-		static Culture const& culture = *culture_manager.get_culture_by_identifier("test_culture");
-		static Religion const& religion = *religion_manager.get_religion_by_identifier("test_religion");
+		static PopType const& type_poor = *get_pop_type_by_identifier(test_pop_type_poor);
+		static PopType const& type_middle = *get_pop_type_by_identifier(test_pop_type_middle);
+		static PopType const& type_rich = *get_pop_type_by_identifier(test_pop_type_rich);
+		static Culture const& culture = *culture_manager.get_culture_by_identifier(test_culture);
+		static Religion const& religion = *religion_manager.get_religion_by_identifier(test_religion);
 		province.add_pop({ type_poor, culture, religion, static_cast<Pop::pop_size_t>(province.get_index() * province.get_index()) * 100 });
 		province.add_pop({ type_middle, culture, religion, static_cast<Pop::pop_size_t>(province.get_index() * province.get_index()) * 50 });
 		province.add_pop({ type_rich, culture, religion, static_cast<Pop::pop_size_t>(province.get_index()) * 1000 });