add: try_get

Author: guinpen98

Library/PAX_MAHOROBA/Rendering/FontSystem.hpp

@@ -267,23 +267,22 @@ namespace paxs {
             const std::uint_least64_t cache_key = createFontCacheKey(language_key, size, buffer_thickness);
 
             // キャッシュに存在すればそれを返す
-            const auto iterator = font_cache_.find(cache_key);
-            if (iterator != font_cache_.end()) {
-                return &(iterator->second);
+            if (auto* cached_font = font_cache_.try_get(cache_key)) {
+                return cached_font;
             }
 
             // フォントパスを取得
-            const auto path_it = language_font_paths_.find(language_key);
+            const auto* path_ptr = language_font_paths_.try_get(language_key);
 
-            if (path_it == language_font_paths_.end()) {
+            if (path_ptr == nullptr) {
                 PAXS_WARNING("FontSystem::getFont - Font path not found for language key: " + std::to_string(language_key));
                 return nullptr;
             }
 
             // 新しいフォントを作成してキャッシュに追加
             font_cache_.emplace(
                 cache_key,
-                paxg::Font(static_cast<int>(size), path_it->second, static_cast<int>(buffer_thickness))
+                paxg::Font(static_cast<int>(size), *path_ptr, static_cast<int>(buffer_thickness))
             );
 
             return &(font_cache_.at(cache_key));

Library/PAX_MAHOROBA/UI/MenuBar/DropDownMenu.hpp

@@ -229,13 +229,13 @@ namespace paxs {
 
         /// @brief 項目の状態を設定（キー指定）
         void setIsItems(const std::uint_least32_t key, const bool is_item) {
-            if (item_index_key.find(key) == item_index_key.end()) {
+            const auto* index = item_index_key.try_get(key);
+            if (index == nullptr) {
                 PAXS_WARNING("DropDownMenu: Key not found in item_index_key.");
                 return;
             }
-            const std::size_t index = item_index_key.at(key);
-            if (index < is_items.size()) {
-                is_items[index] = is_item;
+            if (*index < is_items.size()) {
+                is_items[*index] = is_item;
             }
         }
 

Library/PAX_MAHOROBA/UI/MenuBar/MenuSystem.hpp

@@ -117,12 +117,12 @@ namespace paxs {
         /// @param type メニュー項目の種類
         /// @return メニュー項目のポインタ（存在しない場合はnullptr）
         paxs::DropDownMenu* getDropDownMenu(const paxs::MenuBarType type) {
-            const auto iterator = menu_list_key.find(type);
-            return iterator != menu_list_key.end() ? &menu_list[iterator->second] : nullptr;
+            const auto* index_ptr = menu_list_key.try_get(type);
+            return index_ptr != nullptr ? &menu_list[*index_ptr] : nullptr;
         }
         const paxs::DropDownMenu* getDropDownMenu(const paxs::MenuBarType type) const {
-            const auto iterator = menu_list_key.find(type);
-            return iterator != menu_list_key.end() ? &menu_list[iterator->second] : nullptr;
+            const auto* index_ptr = menu_list_key.try_get(type);
+            return index_ptr != nullptr ? &menu_list[*index_ptr] : nullptr;
         }
 
         bool isHit(const paxs::Vector2<int>& pos) const override {

Library/PAX_SAPIENTICA/Core/Type/UnorderedMap.hpp

@@ -107,6 +107,30 @@ namespace paxs {
             return iterator->second;
         }
 
+        /// @brief キーが存在すればその値を返し、存在しなければ default_value を返す
+        /// @example auto val = map.value_or("key", 0);
+        Value value_or(const Key& key, const Value& default_value) const {
+            const auto iterator = map_.find(key);
+            if (iterator != map_.end()) {
+                return iterator->second;
+            }
+            return default_value;
+        }
+
+        /// @brief キーが存在すれば値へのポインタを返し、存在しなければ nullptr を返す
+        /// @note ポインタ経由で値を変更可能
+        /// @example if (auto* val = map.try_get("key")) { *val = 10; }
+        Value* try_get(const Key& key) {
+            auto iterator = map_.find(key);
+            return (iterator != map_.end()) ? &(iterator->second) : nullptr;
+        }
+
+        /// @brief キーが存在すれば値へのポインタを返し、存在しなければ nullptr を返す (const版)
+        const Value* try_get(const Key& key) const {
+            auto iterator = map_.find(key);
+            return (iterator != map_.end()) ? &(iterator->second) : nullptr;
+        }
+
         /// @brief キーが存在するかチェック
         bool contains(const Key& key) const {
             return map_.find(key) != map_.end();

Library/PAX_SAPIENTICA/IO/Data/SimulationRange.hpp

@@ -40,11 +40,6 @@ namespace paxs {
 
         paxs::UnorderedMap<std::uint_least32_t, StartAndEnd> path_list;
     public:
-
-        StartAndEnd operator[](const std::uint_least32_t key_) {
-            return (path_list.find(key_) == path_list.end()) ? StartAndEnd{} : path_list.at(key_);
-        }
-
         paxs::Vector2<int>& getStart(const std::uint_least32_t key_) {
             return path_list.at(key_).start_position;
         }

Library/PAX_SAPIENTICA/Simulation/Config/JapanProvinces.hpp

@@ -286,9 +286,6 @@ namespace paxs {
 
     public:
         explicit JapanProvinces(const std::string& japan_provinces_path) noexcept {
-
-            //const std::string japan_region_tsv_path = japan_provinces_path + "/JapanRegion.tsv";
-
             inputMtDNA_List(japan_provinces_path);
             inputMtDNA_Region(japan_provinces_path);
             inputLanguage_List(japan_provinces_path);
@@ -308,21 +305,6 @@ namespace paxs {
             }
         }
 
-        /// @brief 日本の地方区分のIDから人口を取得する
-        /// @param id 日本の地方区分のID
-        /// @return 人口
-        /// @note IDが不正な場合は0を返す
-        std::uint_least32_t getJapanRegionPopulation(const std::uint_least8_t id) const noexcept {
-            for (const auto& japan_region : japan_regions) {
-                if (japan_region.id == id) {
-                    return japan_region.population;
-                }
-            }
-            PAXS_WARNING("Failed to get Japan region population: " + std::to_string(id));
-
-            return 0;
-        }
-
         // 言語を取得
         std::uint_least32_t getLanguage(const std::uint_least8_t id) const noexcept {
             for (auto& district : district_list) {
@@ -383,7 +365,7 @@ namespace paxs {
 
             return district_list[0];
         }
-        const District& cgetDistrict(const std::uint_least8_t id) const noexcept {
+        const District& getDistrict(const std::uint_least8_t id) const noexcept {
             for (const auto& district : district_list) {
                 if (district.id == id) {
                     return district;
@@ -405,7 +387,7 @@ namespace paxs {
             auto& weight_list = language_region_list.at(district_list[0].language_region_hash);
             return weight_list.id[weight_list.dist(gen)];
         }
-        const std::string& getLanguage_Name(const std::uint_least8_t id) const noexcept {
+        const std::string& getLanguageName(const std::uint_least8_t id) const noexcept {
             return language_list[id];
         }
         std::size_t getSizeLanguage() const noexcept {
@@ -431,21 +413,6 @@ namespace paxs {
             return mtdna_list.size();
         }
 
-        /// @brief 日本の地区のIDから人口を取得する
-        /// @param id 日本の地区のID
-        /// @return 人口
-        /// @note IDが不正な場合は0を返す
-        std::uint_least32_t getDistrictPopulationAd200(const std::uint_least8_t id) const noexcept {
-            for (const auto& district : district_list) {
-                if (district.id == id) {
-                    return district.init_pop;
-                }
-            }
-            PAXS_WARNING("Failed to get District population: " + std::to_string(id));
-
-            return 0;
-        }
-
         /// @brief 日本の地区のIDから地方区分のIDを取得する
         /// @param id 日本の地区のID
         /// @return 地方区分のID
@@ -461,20 +428,14 @@ namespace paxs {
             return 0;
         }
 
-        /// @brief Get a list of District
-        /// @brief 地区のリストを取得する
-        std::vector<District>& getDistrictList() noexcept {
-            return district_list;
-        }
-        const std::vector<District>& cgetDistrictList() const noexcept {
+        const std::vector<District>& getDistrictList() const noexcept {
             return district_list;
         }
     private:
         std::vector<JapanRegion> japan_regions; // 日本の地方区分
         std::vector<District> district_list; // 日本の地区
         paxs::UnorderedMap<std::uint_least32_t, mtDNA_Region> mtdna_region_list; // mtDNA 地方区分
         paxs::UnorderedMap<std::uint_least32_t, mtDNA_Region> language_region_list; // 言語 地方区分
-        //std::vector<std::uint_least32_t> mtdna_region_hash_list; // mtDNA ハッシュ計算用
         std::vector<std::string> mtdna_list; // mtDNA
         std::vector<std::string> language_list; // 言語
     };

Library/PAX_SAPIENTICA/Simulation/Entity/Settlement.hpp

@@ -309,7 +309,7 @@ namespace paxs {
                         if (female_is_agricultural) {
                             const std::uint_least8_t female_district_id = environment->template getData<std::uint_least8_t>(
                                 SimulationConstants::getInstance().district_key, data_.getPosition());
-                            const District& female_district = japan_provinces_ptr->cgetDistrict(female_district_id);
+                            const District& female_district = japan_provinces_ptr->getDistrict(female_district_id);
                             if (female_district.agricultural_capable == 0) {
                                 // 女性が農耕不可能な地域にいる場合、婚姻できない
                                 continue;
@@ -320,7 +320,7 @@ namespace paxs {
                         if (male_is_agricultural) {
                             const std::uint_least8_t male_district_id = environment->template getData<std::uint_least8_t>(
                                 SimulationConstants::getInstance().district_key, close_settlement.getPosition());
-                            const District& male_district = japan_provinces_ptr->cgetDistrict(male_district_id);
+                            const District& male_district = japan_provinces_ptr->getDistrict(male_district_id);
                             if (male_district.agricultural_capable == 0) {
                                 // 男性が農耕不可能な地域にいる場合、婚姻できない
                                 continue;
@@ -331,7 +331,7 @@ namespace paxs {
                         if (SimulationConstants::getInstance().maternal_residence_probability > 0.0f && male_is_agricultural) {
                             const std::uint_least8_t female_district_id = environment->template getData<std::uint_least8_t>(
                                 SimulationConstants::getInstance().district_key, data_.getPosition());
-                            const District& female_district = japan_provinces_ptr->cgetDistrict(female_district_id);
+                            const District& female_district = japan_provinces_ptr->getDistrict(female_district_id);
                             if (female_district.agricultural_capable == 0) {
                                 continue; // 移動先が農耕不可能なので婚姻不可
                             }
@@ -341,7 +341,7 @@ namespace paxs {
                         if (SimulationConstants::getInstance().maternal_residence_probability < 1.0f && female_is_agricultural) {
                             const std::uint_least8_t male_district_id = environment->template getData<std::uint_least8_t>(
                                 SimulationConstants::getInstance().district_key, close_settlement.getPosition());
-                            const District& male_district = japan_provinces_ptr->cgetDistrict(male_district_id);
+                            const District& male_district = japan_provinces_ptr->getDistrict(male_district_id);
                             if (male_district.agricultural_capable == 0) {
                                 continue; // 移動先が農耕不可能なので婚姻不可
                             }
@@ -594,7 +594,7 @@ namespace paxs {
                 if (has_agricultural_agents && japan_provinces_ptr != nullptr) {
                     const std::uint_least8_t target_district_id = environment->template getData<std::uint_least8_t>(
                         SimulationConstants::getInstance().district_key, target_position);
-                    const District& target_district = japan_provinces_ptr->cgetDistrict(target_district_id);
+                    const District& target_district = japan_provinces_ptr->getDistrict(target_district_id);
                     if (target_district.agricultural_capable == 0) {
                         ++loop_count;
                         continue;
@@ -656,7 +656,7 @@ namespace paxs {
                     if (has_agricultural_agents && japan_provinces_ptr != nullptr) {
                         const std::uint_least8_t target_district_id = environment->template getData<std::uint_least8_t>(
                             SimulationConstants::getInstance().district_key, target_position);
-                        const District& target_district = japan_provinces_ptr->cgetDistrict(target_district_id);
+                        const District& target_district = japan_provinces_ptr->getDistrict(target_district_id);
                         if (target_district.agricultural_capable == 0) {
                             ++loop_count;
                             continue;
@@ -794,7 +794,7 @@ namespace paxs {
             if (japan_provinces_ptr != nullptr) {
                 const std::uint_least8_t current_district_id = environment->template getData<std::uint_least8_t>(
                     SimulationConstants::getInstance().district_key, data_.getPosition());
-                const District& current_district = japan_provinces_ptr->cgetDistrict(current_district_id);
+                const District& current_district = japan_provinces_ptr->getDistrict(current_district_id);
                 is_agricultural_capable = (current_district.agricultural_capable != 0);
             }
 

Library/PAX_SAPIENTICA/Simulation/Manager/SettlementSimulator.hpp

@@ -205,12 +205,12 @@ namespace paxs {
         }
         // 結果の地区名を出力
         void outputResultDistrictName(std::ofstream& ofs_, const std::size_t i_) const {
-            ofs_ << japan_provinces->cgetDistrictList()[i_].name << '\t';
+            ofs_ << japan_provinces->getDistrictList()[i_].name << '\t';
         }
         // 集落の初期化時にシミュレーション変数を出力
         void initResults() {
             result_writer_ = std::make_unique<SimulationResultWriter>();
-            result_writer_->initialize(SimulationConstants::getInstance().output_directory_name, japan_provinces->cgetDistrictList());
+            result_writer_->initialize(SimulationConstants::getInstance().output_directory_name, japan_provinces->getDistrictList());
         }
 
         /// @brief Initialize the simulator.
@@ -241,7 +241,7 @@ namespace paxs {
             // 可住地の数を出力
             for (std::size_t i = 1; i < max_number_of_districts; ++i) {
                 result_writer_->writeHabitableLand(
-                    japan_provinces->cgetDistrictList()[i].name,
+                    japan_provinces->getDistrictList()[i].name,
                     (*live_list)[i + 1].habitable_land_positions.size()
                 );
             }
@@ -266,23 +266,23 @@ namespace paxs {
             const auto target_index = target_key.to(SettlementGridsType{});
 
             // ターゲットの地域が登録されているか？
-            const auto target_iterator = settlement_grids.find(target_index);
-            const auto current_iterator = settlement_grids.find(current_index);
-            if (current_iterator == settlement_grids.end()) {
+            auto* const target_ptr = settlement_grids.try_get(target_index);
+            auto* const current_ptr = settlement_grids.try_get(current_index);
+            if (current_ptr == nullptr) {
                 return; // current_indexが存在しない場合は何もしない
             }
 
-            if (target_iterator != settlement_grids.end()) {
+            if (target_ptr != nullptr) {
                 // 登録されている場合はそのターゲット地域へ移動
-                target_iterator->second.moveSettlementToThis(current_iterator->second.getSettlement(settlement_id));
+                target_ptr->moveSettlementToThis(current_ptr->getSettlement(settlement_id));
             }
             else {
                 // 登録されていない場合は新しく地域を作成
                 SettlementGrid settlement_grid = SettlementGrid(target_key * SimulationConstants::getInstance().cell_group_length, environment, gen);
-                settlement_grid.moveSettlementToThis(current_iterator->second.getSettlement(settlement_id));
+                settlement_grid.moveSettlementToThis(current_ptr->getSettlement(settlement_id));
                 settlement_grids.emplace(target_index, std::move(settlement_grid));
             }
-            current_iterator->second.deleteSettlement(settlement_id);
+            current_ptr->deleteSettlement(settlement_id);
         }
 
         /// @brief Execute the simulation for the one step.
@@ -345,7 +345,7 @@ namespace paxs {
                 stats.settlement_count = sat_num;
                 stats.population_count = pop_num;
                 stats.get_mtdna_name = [this](std::uint_least8_t id) { return japan_provinces->getMtDNA_Name(id); };
-                stats.get_language_name = [this](std::uint_least8_t id) { return japan_provinces->getLanguage_Name(id); };
+                stats.get_language_name = [this](std::uint_least8_t id) { return japan_provinces->getLanguageName(id); };
 
                 // Aggregate region stats and prepare district stats
                 for (std::size_t i = 1; i < max_number_of_districts; ++i) {
@@ -701,7 +701,7 @@ namespace paxs {
 
             // 地区と人口のマップ
             paxs::UnorderedMap<std::uint_least8_t, std::uint_least32_t> district_population_map;
-            for (const auto& district : japan_provinces->cgetDistrictList()) {
+            for (const auto& district : japan_provinces->getDistrictList()) {
                 if (((is_ad200) ? district.init_pop : district.immigrant) == 0) {
                     continue;
                 }
@@ -759,7 +759,7 @@ namespace paxs {
                     }
 
                     // 配置する集落の人口を決定
-                    paxs::District district = japan_provinces->cgetDistrict(district_id);
+                    paxs::District district = japan_provinces->getDistrict(district_id);
                     int settlement_population = std::uniform_int_distribution<>(district.settlement_pop_min, district.settlement_pop_max)(gen);
                     settlement_population = (std::min)(settlement_population, static_cast<int>(district_population_it->second));