haruki-sekai-deck-recommend-cpp 0.2.36__tar.gz → 0.3.2__tar.gz

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/.github/copilot-instructions.md

@@ -78,6 +78,23 @@ and npm publishing use Trusted Publishing/OIDC through the `pypi-publish` and
 `npm-publish` environments. PyPI publishing should only download artifacts
 prefixed with `pypi-`.
 
+## Performance & Regression Verification
+
+Changes to search algorithms, deck evaluation, or other hot paths must
+be validated with the local harness in `tools/bench/` (see its README):
+
+- `regress.py run/compare` — fixed-seed regression. Deterministic
+  scenarios must stay bit-identical; time-budgeted scenarios (DFS_GA /
+  SA) are compared on top values only.
+- `rl_quality.py` — RL hit-rate protocol (`DECK_RL_SEED_CACHE_DISABLE=1`;
+  repeated runs must keep hitting the GA-reference optimum). RL stage
+  budgets are a quality floor; never trim them for speed.
+- `bench_matrix.py` — old-vs-new latency matrix; build the old version
+  from a git worktree and run both builds in the same session.
+
+Fixtures (masterdata, music metas, user suite) are local-only and must
+never be committed.
+
 ## Git Commits
 
 All commit subjects must follow:

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/.github/workflows/release.yml

@@ -106,7 +106,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v6.4.0
         with:
-          node-version: "22.14.0"
+          node-version: "24"
           registry-url: "https://registry.npmjs.org"
 
       - name: Update npm

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/.gitignore

@@ -4,3 +4,11 @@ sandbox/
 .vscode/
 npm/haruki-sekai-deck-recommend-cpp/sekai_deck_recommend.js
 npm/haruki-sekai-deck-recommend-cpp/sekai_deck_recommend.wasm
+__pycache__/
+.DS_Store
+.idea/
+collections.suite.json
+suite.json
+uv.lock
+haruki-sekai-master/
+haruki-sekai-sc-master/

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/AGENTS.md

@@ -149,6 +149,23 @@ and keep their schemas identical.
   userdata compatibility.
 - `src/card-information/*`: power breakdowns and card state normalization.
 
+## Performance & Regression Verification
+
+Changes to search algorithms, deck evaluation, or other hot paths must
+be validated with the local harness in `tools/bench/` (see its README):
+
+- `regress.py run/compare` — fixed-seed regression. Deterministic
+  scenarios must stay bit-identical; time-budgeted scenarios (DFS_GA /
+  SA) are compared on top values only.
+- `rl_quality.py` — RL hit-rate protocol (`DECK_RL_SEED_CACHE_DISABLE=1`;
+  repeated runs must keep hitting the GA-reference optimum). RL stage
+  budgets are a quality floor; never trim them for speed.
+- `bench_matrix.py` — old-vs-new latency matrix; build the old version
+  from a git worktree and run both builds in the same session.
+
+Fixtures (masterdata, music metas, user suite) are local-only and must
+never be committed.
+
 ## Git Commits
 
 All commit subjects must follow:

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/CLAUDE.md

@@ -157,6 +157,23 @@ the deck-service integration build:
   shaped; compact arrays are local export fixtures, not the API contract.
 - `src/card-information/*` — power breakdown and card state normalization.
 
+## Performance & Regression Verification
+
+Changes to search algorithms, deck evaluation, or other hot paths must
+be validated with the local harness in `tools/bench/` (see its README):
+
+- `regress.py run/compare` — fixed-seed regression. Deterministic
+  scenarios must stay bit-identical; time-budgeted scenarios (DFS_GA /
+  SA) are compared on top values only.
+- `rl_quality.py` — RL hit-rate protocol (`DECK_RL_SEED_CACHE_DISABLE=1`;
+  repeated runs must keep hitting the GA-reference optimum). RL stage
+  budgets are a quality floor; never trim them for speed.
+- `bench_matrix.py` — old-vs-new latency matrix; build the old version
+  from a git worktree and run both builds in the same session.
+
+Fixtures (masterdata, music metas, user suite) are local-only and must
+never be committed.
+
 ## Git Commit Format
 
 All commit subjects must follow:

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 
-project(sekai-deck-recommend-cpp VERSION 0.2.36 LANGUAGES C CXX)
+project(sekai-deck-recommend-cpp VERSION 0.3.2 LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -19,6 +19,10 @@ list(REMOVE_ITEM SRC_FILES
     "${PROJECT_SOURCE_DIR}/src/sekai_deck_recommend_wasm.cpp"
 )
 
+# 浏览器端引擎内并行（需要站点开启COOP/COEP以获得SharedArrayBuffer）；
+# 默认OFF，产物与历史一致
+option(SEKAI_WASM_THREADS "Build wasm with pthreads for in-engine parallelism" OFF)
+
 if (EMSCRIPTEN)
     add_executable(sekai_deck_recommend
         ${SRC_FILES}
@@ -29,6 +33,13 @@ if (EMSCRIPTEN)
         -Wall -Wextra -Wuninitialized
         -fwasm-exceptions
     )
+    if (SEKAI_WASM_THREADS)
+        target_compile_options(sekai_deck_recommend PRIVATE -pthread)
+        target_link_options(sekai_deck_recommend PRIVATE
+            -pthread
+            "SHELL:-s PTHREAD_POOL_SIZE=navigator.hardwareConcurrency"
+        )
+    endif()
     target_link_options(sekai_deck_recommend PRIVATE
         -fwasm-exceptions
         -lembind
@@ -73,6 +84,15 @@ else()
         )
     endif()
 
+    # Release构建启用跨编译单元优化（实测低个位数百分比收益，构建耗时增加可接受）
+    if (CMAKE_BUILD_TYPE STREQUAL "Release")
+        include(CheckIPOSupported)
+        check_ipo_supported(RESULT ipo_supported OUTPUT ipo_check_output)
+        if (ipo_supported)
+            set_property(TARGET sekai_deck_recommend PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
+        endif()
+    endif()
+
     set(INSTALL_DIR "sekai_deck_recommend_cpp")
 
     install(TARGETS sekai_deck_recommend DESTINATION ${INSTALL_DIR})

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/PKG-INFO

@@ -1,4 +1,4 @@
 Metadata-Version: 2.2
 Name: haruki-sekai-deck-recommend-cpp
-Version: 0.2.36
+Version: 0.3.2
 

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/README.md

@@ -75,8 +75,16 @@ options = DeckRecommendOptions()
 # optimizing target in ["score", "power", "skill", "bonus"], default is "score"
 options.target = "score"
 
-# "ga" for genetic algorithm, "dfs" for brute-force search
-# default is "ga"
+# one of ["dfs", "ga", "dfs_ga", "rl", "sa"], default is "ga"
+# ("dfs" for challenge live types).
+#   dfs    - exact branch-and-bound; for score target on marathon/banner events
+#            and challenge live it completes the full card pool in ~100ms with
+#            provably optimal results (give world bloom / mysekai a timeout_ms)
+#   rl     - lowest latency (~30ms) with learned cross-request warm starts;
+#            recommended for high-throughput services
+#   dfs_ga - adaptive: exact DFS result when it completes in budget,
+#            GA refinement otherwise
+#   ga     - genetic algorithm baseline; sa - legacy simulated annealing
 options.algorithm = "ga"   
 
 options.region = "jp"
@@ -124,3 +132,17 @@ npm pack
 - Some modifications based on [moe-sekai/sekai-deck-recommend-cpp](https://github.com/moe-sekai/sekai-deck-recommend-cpp)
 - JSON parsing and WebAssembly JSON payloads by [yyjson](https://github.com/ibireme/yyjson)
 - Python bindings powered by [pybind11](https://github.com/pybind/pybind11)
+
+## Performance & Concurrency
+
+- `recommend_batch(options_list)` (Python) / `recommendBatch(jsonArray)` (wasm)
+  runs multiple requests — different algorithms, musics or targets — in one
+  call and returns results in input order.
+- Engine-internal parallelism is opt-in via the `DECK_ENGINE_THREADS`
+  environment variable or `set_engine_thread_count()` (default is fully
+  serial and bit-identical to historical behavior). The Python `recommend`
+  releases the GIL, so calls can also run concurrently from Python threads.
+- A pthreads wasm variant can be built with `-DSEKAI_WASM_THREADS=ON`
+  (requires COOP/COEP headers for SharedArrayBuffer).
+- Local benchmark / regression tooling lives in `tools/bench/` (see its
+  README for the verification methodology used for performance changes).

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/npm/haruki-sekai-deck-recommend-cpp/index.d.ts

@@ -273,6 +273,8 @@ export interface RecommendDeck {
 
 export interface RecommendResult {
   decks: RecommendDeck[]
+  /** Wall-clock time of the search algorithm itself in milliseconds (excludes option/user-data parsing and result serialization). */
+  cost_ms: number
 }
 
 export interface WorldBloomSupportCard {
@@ -289,6 +291,7 @@ export interface RawSekaiDeckRecommendInstance {
   updateMasterdataFromObject(data: Record<string, unknown>, region: SekaiRegion): void
   updateMusicmetasFromString(data: string, region: SekaiRegion): void
   recommend(optionsJson: string): string
+  recommendBatch(optionsJsonArray: string): string
   recommendAreaItems(optionsJson: string): string
   recommendMusic(optionsJson: string): string
   calculateExactLive(optionsJson: string): string
@@ -299,6 +302,8 @@ export interface RawSekaiDeckRecommendInstance {
 export interface RawSekaiDeckRecommendModule {
   SekaiDeckRecommend: new () => RawSekaiDeckRecommendInstance
   initDataPath(path: string): void
+  /** Effective only in wasm builds compiled with SEKAI_WASM_THREADS; a no-op in the default single-threaded package. */
+  setEngineThreadCount(count: number): void
   [key: string]: unknown
 }
 
@@ -312,6 +317,8 @@ export class SekaiDeckRecommendWasm {
   loadMasterData(region: SekaiRegion, data: Record<string, unknown>): void
   loadMusicMetas(region: SekaiRegion, data: string | object): void
   recommend(options: RecommendOptions): RecommendResult
+  /** Runs each request through the full recommend pipeline; results are returned in input order. */
+  recommendBatch(optionsList: RecommendOptions[]): RecommendResult[]
   getWorldBloomSupportCards(options: WorldBloomSupportOptions): WorldBloomSupportCard[]
   recommendAreaItems(options: AreaItemRecommendOptions): RecommendAreaItem[]
   recommendMusic(options: MusicRecommendOptions, deck: RecommendDeck): RecommendMusic[]

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/npm/haruki-sekai-deck-recommend-cpp/index.js

@@ -71,6 +71,15 @@ export class SekaiDeckRecommendWasm {
     return JSON.parse(json)
   }
 
+  recommendBatch(optionsList) {
+    this.#assertActive()
+    if (!Array.isArray(optionsList)) {
+      throw new TypeError("recommendBatch expects an array of options.")
+    }
+    const json = this.#engine.recommendBatch(JSON.stringify(optionsList.map(normalizeUserDataAliases)))
+    return JSON.parse(json)
+  }
+
   getWorldBloomSupportCards(options) {
     this.#assertActive()
     const json = this.#engine.getWorldBloomSupportCards(JSON.stringify(normalizeUserDataAliases(options)))

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/npm/haruki-sekai-deck-recommend-cpp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haruki-sekai-deck-recommend-cpp",
-  "version": "0.2.36",
+  "version": "0.3.2",
   "description": "WebAssembly bindings for the Project Sekai deck recommendation engine.",
   "type": "module",
   "license": "LGPL-2.0-only",

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "haruki-sekai-deck-recommend-cpp"
-version = "0.2.36"
+version = "0.3.2"
 
 [tool.scikit-build]
 build-dir = "build/{wheel_tag}"

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/src/card-information/card-calculator.cpp

@@ -1,6 +1,8 @@
 #include "card-information/card-calculator.h"
 #include "card-calculator.h"
 
+#include "common/parallel-utils.h"
+
 std::optional<CardDetail> CardCalculator::getCardDetail(
     const UserCard& userCard,
     const std::vector<AreaItemLevel>& userAreaItemLevels,
@@ -15,17 +17,12 @@ std::optional<CardDetail> CardCalculator::getCardDetail(
     const std::optional<std::unordered_map<int, int>>& customBonusSupportUnits
 )
 {
-    auto& cards = this->dataProvider.masterData->cards;
-
-    Card card{};
-    try {
-        card = findOrThrow(cards, [&](const auto &it) { 
-            return it.id == userCard.cardId; 
-        });
-    } catch (const ElementNoFoundError& e) {
+    const Card* cardPtr = this->dataProvider.masterData->findCardById(userCard.cardId);
+    if (cardPtr == nullptr) {
         std::cerr << "[warning] card id " << userCard.cardId << " appears in user data but not in master data." << std::endl;
         return std::nullopt;
     }
+    const Card& card = *cardPtr;
 
     CardConfig cfg{};
     // 单独卡配置覆盖稀有度卡配置
@@ -109,19 +106,25 @@ std::vector<CardDetail> CardCalculator::batchGetCardDetail(
 )
 {
     std::vector<CardDetail> ret{};
+    ret.reserve(userCards.size());
     auto areaItemLevels0 = areaItemLevels.empty() ? this->areaItemService.getAreaItemLevels() : areaItemLevels;
     // 自定义世界专项加成
     auto userCanvasBonusCards = this->mysekaiService.getMysekaiCanvasBonusCards();
     auto userGateBonuses = this->mysekaiService.getMysekaiGateBonuses();
-    // 每张卡单独计算
-    for (const auto &userCard : userCards) {
-        auto cardDetail = this->getCardDetail(
-            userCard, areaItemLevels0, config, singleCardConfig, eventConfig, 
-            userCanvasBonusCards.find(userCard.cardId) != userCanvasBonusCards.end(),
+    // 每张卡的计算相互独立（各计算器无状态、masterdata只读），
+    // 结果写入按下标预分配的槽位后顺序收集，与串行结果逐位一致
+    std::vector<std::optional<CardDetail>> details(userCards.size());
+    parallelFor(userCards.size(), [&](std::size_t i) {
+        details[i] = this->getCardDetail(
+            userCards[i], areaItemLevels0, config, singleCardConfig, eventConfig,
+            userCanvasBonusCards.find(userCards[i].cardId) != userCanvasBonusCards.end(),
             userGateBonuses, scoreUpLimit, customBonusCharacterIds, customBonusAttr, customBonusSupportUnits
         );
+    });
+    for (auto& cardDetail : details) {
         if (cardDetail.has_value()) {
-            ret.push_back(cardDetail.value());
+            // CardDetail结构体很大，移动而不是拷贝
+            ret.push_back(std::move(cardDetail.value()));
         }
     }
     return ret;
@@ -154,22 +157,28 @@ SupportDeckCard CardCalculator::getSupportDeckCard(
     int eventId,
     int specialCharacterId,
     bool masterMax,
-    bool skillMax
+    bool skillMax,
+    bool requireSpecialUnitMatch
 )
 {
     UserCard supportCard = card;
     if (masterMax || skillMax) {
-        auto& cards = this->dataProvider.masterData->cards;
-        auto cardData = findOrThrow(cards, [&](const Card& it) {
-            return it.id == card.cardId;
-        }, [&]() { return "Support Deck Card not found for cardId=" + std::to_string(card.cardId); });
+        const Card* cardData = this->dataProvider.masterData->findCardById(card.cardId);
+        if (cardData == nullptr) {
+            throw ElementNoFoundError("Support Deck Card not found for cardId=" + std::to_string(card.cardId));
+        }
         CardConfig cfg{};
         cfg.masterMax = masterMax;
         cfg.skillMax = skillMax;
-        supportCard = this->cardService.applyCardConfig(card, cardData, cfg);
+        supportCard = this->cardService.applyCardConfig(card, *cardData, cfg);
     }
 
-    auto bonus = this->bloomEventCalculator.getCardSupportDeckBonus(supportCard, eventId, specialCharacterId);
+    auto bonus = this->bloomEventCalculator.getCardSupportDeckBonus(
+        supportCard,
+        eventId,
+        specialCharacterId,
+        requireSpecialUnitMatch
+    );
     return SupportDeckCard{
         .cardId = card.cardId,
         .bonus = bonus.value_or(0.0),

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/src/card-information/card-calculator.h

@@ -139,7 +139,8 @@ public:
         int eventId,
         int specialCharacterId,
         bool masterMax = false,
-        bool skillMax = false
+        bool skillMax = false,
+        bool requireSpecialUnitMatch = true
     );
 };
 

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/src/card-information/card-detail-map.h

@@ -4,10 +4,12 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
+#include <cstdint>
 #include <limits>
 #include <optional>
 #include <string>
 #include <map>
+#include <vector>
 
 #include "common/collection-utils.h"
 
@@ -21,22 +23,30 @@ constexpr int ATTR_MEMBER_MAX = 2;
 template <typename T>
 class CardDetailMap {
 
-    inline const std::optional<T> getValue(int unit, int unitMember, int attrMember) const {
+    // 槽位表只存紧凑存储的下标：绝大多数键位为空，
+    // 相比每键直接存optional<T>，结构体体积缩一个数量级，拷贝/缓存开销随之下降
+    static constexpr uint8_t EMPTY_SLOT = 0xFF;
+
+    std::array<uint8_t, UNIT_MAX * UNIT_MEMBER_MAX * ATTR_MEMBER_MAX> slots{};
+    std::vector<T> storage{};
+
+    inline const T* getValue(int unit, int unitMember, int attrMember) const {
         int key = getKey(unit, unitMember, attrMember);
-        if (this->values[key].has_value())
-            return this->values[key];
-        return std::nullopt;
+        return slots[key] == EMPTY_SLOT ? nullptr : &storage[slots[key]];
     }
 
 public:
-    std::array<std::optional<T>, UNIT_MAX * UNIT_MEMBER_MAX * ATTR_MEMBER_MAX> values = {};
     int min = std::numeric_limits<int>::max();
     int max = std::numeric_limits<int>::min();
-    
+
+    CardDetailMap() {
+        slots.fill(EMPTY_SLOT);
+    }
+
     /**
      * 设定给定情况下的值
      * 为了减少内存消耗，人数并非在所有情况下均为实际值，可能会用1代表混组或无影响
-     * @param unit 该map的类别; 组合不影响实际值的情况:any 组分:对应组合(vs可能有2种) vsbf花前:diff ocbf花前:ref 
+     * @param unit 该map的类别; 组合不影响实际值的情况:any 组分:对应组合(vs可能有2种) vsbf花前:diff ocbf花前:ref
      * @param unitMember 组合对应的人数（组分技能代表相同组数1-5; vsbf花前代表为不同组数0-2; 其他情况5为同组1为混组或无影响）
      * @param attrMember 卡牌属性对应的人数（5人为同色、1人为混色或无影响）
      * @param cmpValue 设置最小值、最大值的用于剪枝的可比较值
@@ -45,7 +55,13 @@ public:
     inline void set(int unit, int unitMember, int attrMember, int cmpValue, const T& value) {
         this->min = std::min(this->min, cmpValue);
         this->max = std::max(this->max, cmpValue);
-        this->values[getKey(unit, unitMember, attrMember)] = value;
+        int key = getKey(unit, unitMember, attrMember);
+        if (slots[key] == EMPTY_SLOT) {
+            slots[key] = uint8_t(storage.size());
+            storage.push_back(value);
+        } else {
+            storage[slots[key]] = value;
+        }
     }
 
     /**
@@ -58,31 +74,31 @@ public:
     inline T get(int unit, int unitMember, int attrMember) const {
         // 所有情况下，属性实际只有混不混的区别
         attrMember = (attrMember == 5 ? 5 : 1);
-        std::optional<T> best{};
+        const T* best = nullptr;
 
         // (vsbf花前) 不同组数只能是0-2
         if (unit == Enums::Unit::diff) {
             best = this->getValue(Enums::Unit::diff, std::min(2, unitMember), 1);
-            if (best.has_value()) return best.value();
+            if (best) return *best;
         }
 
         // (ocbf花前) 这边unit其实是当作技能tag用
         if (unit == Enums::Unit::ref) {
             best = this->getValue(Enums::Unit::ref, 1, 1);
-            if (best.has_value()) return best.value();
+            if (best) return *best;
         }
 
-        // (组分) 受指定组合人数影响的情况 
-        best = this->getValue(unit, unitMember, attrMember);  
-        if (best.has_value()) return best.value();
+        // (组分) 受指定组合人数影响的情况
+        best = this->getValue(unit, unitMember, attrMember);
+        if (best) return *best;
 
         // (综合力计算) 只考虑混不混组的情况
         best = this->getValue(unit, unitMember == 5 ? 5 : 1, attrMember);
-        if (best.has_value()) return best.value();
+        if (best) return *best;
 
         // 技能为固定数值的情况（能够变化但取到保底固定数值的也会落到这里）
         best = this->getValue(Enums::Unit::any, 1, 1);
-        if (best.has_value()) return best.value();
+        if (best) return *best;
 
         // 如果这还找不到，说明给的情况就不对
         throw std::runtime_error("case not found");

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/src/card-information/card-power-calculator.cpp

@@ -145,10 +145,8 @@ int CardPowerCalculator::getCharacterBonusPower(const BasePower &basePower, int
     auto userCharacter = findOrThrow(userCharacters, [&](auto& it) {
         return it.characterId == characterId;
     }, [&]() { return "User character not found for characterId=" + std::to_string(characterId); });
-    auto characterRank = findOrThrow(characterRanks, [&](auto& it) {
-        return it.characterId == userCharacter.characterId &&
-               it.characterRank == userCharacter.characterRank;
-    }, [&]() { return "Character rank not found for characterId=" + std::to_string(userCharacter.characterId) + " rank=" + std::to_string(userCharacter.characterRank); });
+    const auto& characterRank = this->dataProvider.masterData->getCharacterRank(
+        userCharacter.characterId, userCharacter.characterRank);
     double rates[3] = {
         characterRank.power1BonusRate,
         characterRank.power2BonusRate,

{haruki_sekai_deck_recommend_cpp-0.2.36 → haruki_sekai_deck_recommend_cpp-0.3.2}/src/card-information/card-skill-calculator.cpp

@@ -130,15 +130,12 @@ Skill CardSkillCalculator::getSkill(const UserCard &userCard, const Card &card,
     if (card.specialTrainingSkillId != 0 && afterTraining) {
         skillId = card.specialTrainingSkillId;
     }
-    auto skills = dataProvider.masterData->skills;
-    return findOrThrow(skills, [&](auto& it) {
-        return it.id == skillId;
-    }, [&]() { return "Skill not found for skillId=" + std::to_string(skillId); });
+    return dataProvider.masterData->getSkillById(skillId);
 }
 
 int CardSkillCalculator::getCharacterRank(int characterId)
 {
-    auto userCharacters = dataProvider.userData->userCharacters;
+    auto& userCharacters = dataProvider.userData->userCharacters;
     auto userCharacter = findOrThrow(userCharacters, [&](auto& it) {
         return it.characterId == characterId;
     }, [&]() { return "User character not found for characterId=" + std::to_string(characterId); });