haruki-sekai-deck-recommend-cpp 0.4.1__tar.gz → 0.4.2__tar.gz

{haruki_sekai_deck_recommend_cpp-0.4.1 → haruki_sekai_deck_recommend_cpp-0.4.2}/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.2
 Name: haruki-sekai-deck-recommend-cpp
-Version: 0.4.1
+Version: 0.4.2
 Requires-Python: >=3.10
 

{haruki_sekai_deck_recommend_cpp-0.4.1 → haruki_sekai_deck_recommend_cpp-0.4.2}/npm/haruki-sekai-deck-recommend-cpp/package.json

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

{haruki_sekai_deck_recommend_cpp-0.4.1 → haruki_sekai_deck_recommend_cpp-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "haruki-sekai-deck-recommend-cpp"
-version = "0.4.1"
+version = "0.4.2"
 requires-python = ">=3.10"
 
 [tool.scikit-build]

{haruki_sekai_deck_recommend_cpp-0.4.1 → haruki_sekai_deck_recommend_cpp-0.4.2}/src/card-priority/bloom-event-card-priority.h

@@ -4,7 +4,8 @@
 #include "card-priority/card-priority-filter.h"
 #include "common/collection-utils.h"
 
-inline const std::vector<CardPriority> bloomCardPriorities = {
+inline const std::vector<CardPriority>& bloomCardPriorities() {
+    static const std::vector<CardPriority> table = {
     CardPriority{
         .eventBonus = 25 + 25, // 同队 5破四星
         .cardRarityType = Enums::CardRarityType::rarity_4,
@@ -90,5 +91,7 @@ inline const std::vector<CardPriority> bloomCardPriorities = {
         .priority = 100
     }
 };
+    return table;
+}
 
 #endif

{haruki_sekai_deck_recommend_cpp-0.4.1 → haruki_sekai_deck_recommend_cpp-0.4.2}/src/card-priority/card-priority-filter.cpp

@@ -161,11 +161,11 @@ std::vector<CardDetail> filterCardPriority(int liveType, int eventType, std::vec
 std::vector<CardPriority> getCardPriorities(int liveType, int eventType)
 {
     if (Enums::LiveType::isChallenge(liveType))
-        return challengeLiveCardPriorities;
+        return challengeLiveCardPriorities();
     if (eventType == Enums::EventType::world_bloom)
-        return bloomCardPriorities;
+        return bloomCardPriorities();
     if (eventType == Enums::EventType::marathon || eventType == Enums::EventType::cheerful)
-        return marathonCheerfulCardPriorities;
+        return marathonCheerfulCardPriorities();
     // 如果都不满足，那就只能都不筛选，所有卡全上
     return std::vector<CardPriority>();
 }

{haruki_sekai_deck_recommend_cpp-0.4.1 → haruki_sekai_deck_recommend_cpp-0.4.2}/src/card-priority/challenge-live-card-priority.h

@@ -4,7 +4,8 @@
 #include "card-priority/card-priority-filter.h"
 #include "common/collection-utils.h"
 
-inline const std::vector<CardPriority> challengeLiveCardPriorities = {
+inline const std::vector<CardPriority>& challengeLiveCardPriorities() {
+    static const std::vector<CardPriority> table = {
     CardPriority{
         .eventBonus = 0,
         .cardRarityType = Enums::CardRarityType::rarity_4,
@@ -36,6 +37,8 @@ inline const std::vector<CardPriority> challengeLiveCardPriorities = {
         .priority = 40
     }
 };
+    return table;
+}
 
 
 #endif

{haruki_sekai_deck_recommend_cpp-0.4.1 → haruki_sekai_deck_recommend_cpp-0.4.2}/src/card-priority/marathon-cheerful-event-card-priority.h

@@ -4,7 +4,8 @@
 #include "card-priority/card-priority-filter.h"
 #include "common/collection-utils.h"
 
-inline const std::vector<CardPriority> marathonCheerfulCardPriorities = {
+inline const std::vector<CardPriority>& marathonCheerfulCardPriorities() {
+    static const std::vector<CardPriority> table = {
     CardPriority{
         .eventBonus = 25 + 25 + 20 + 25, // 同色同队 当期卡 5破四星
         .cardRarityType = Enums::CardRarityType::rarity_4,
@@ -174,5 +175,7 @@ inline const std::vector<CardPriority> marathonCheerfulCardPriorities = {
         .priority = 100
     }
 };
+    return table;
+}
 
 #endif

{haruki_sekai_deck_recommend_cpp-0.4.1 → haruki_sekai_deck_recommend_cpp-0.4.2}/src/deck-recommend/base-deck-recommend.cpp

@@ -414,6 +414,16 @@ std::vector<RecommendDeck> BaseDeckRecommend::recommendHighScoreDeck(
     if (int(occupiedCharacterIds.size()) > config.member) {
         throw std::runtime_error("Fixed cards and fixed characters exceed member count");
     }
+    // 固定角色必须至少有一张可用卡（已持有且稀有度未被禁用、未被组合过滤），否则任何算法都无法组队
+    for (const auto characterId : requiredCharacters) {
+        if (fixedCardCharacterIds.count(characterId)) continue;
+        bool hasCard = std::any_of(cards.begin(), cards.end(), [&](const CardDetail& card) {
+            return card.characterId == characterId;
+        });
+        if (!hasCard)
+            throw std::invalid_argument("Fixed character " + std::to_string(characterId)
+                + " has no usable card (not owned, rarity disabled or filtered by unit)");
+    }
 
     auto honorBonus = deckCalculator.getHonorBonusPower();
 
@@ -1072,6 +1082,18 @@ std::vector<RecommendDeck> BaseDeckRecommend::recommendHighScoreDeck(
         std::vector<CardDetail> seedCards = cards;
         std::vector<CardDetail> seedPrev{};
         seedCards = filterCardPriority(liveType, eventConfig.eventType, seedCards, seedPrev, baseConfig.member);
+        // 优先级筛选只看活动加成/稀有度/突破，可能把固定角色（及固定卡）全部筛掉，
+        // 导致GA预热对固定角色无卡可选（"no cards to select"），这里把它们补回种子卡池
+        if (!requiredCharacterSet.empty() || !fixedCards.empty()) {
+            std::unordered_set<int> seedIds{};
+            for (const auto& card : seedCards) seedIds.insert(card.cardId);
+            for (const auto& card : cards) {
+                if ((requiredCharacterSet.count(card.characterId) || fixedCardIds.count(card.cardId))
+                    && seedIds.insert(card.cardId).second) {
+                    seedCards.push_back(card);
+                }
+            }
+        }
         {
             // 先用一小段GA预热把结果队列垫满，DFS的上界剪枝从第一个结点就能生效
             //（剪枝门槛要求队列中已有limit个结果，冷启动下前期完全不剪枝）

{haruki_sekai_deck_recommend_cpp-0.4.1 → haruki_sekai_deck_recommend_cpp-0.4.2}/tests/test_binding_smoke.py

@@ -625,6 +625,110 @@ class MysekaiGateBonusTests(unittest.TestCase):
         bonuses = self.gate_bonuses([(99, 1), (1, 999)])
         self.assertEqual(set(bonuses.values()), {0})
 
+# Marathon event whose bonus characters (1, 5, 9, 13, 17) fill a same-attribute
+# deck on their own, so the card priority pre-filter drops every other card.
+PINNED_EVENT_ID = 300
+PINNED_BONUS_CHARACTERS = (1, 5, 9, 13, 17)
+
+
+def pinned_marathon_master_data():
+    data = wl3_rule_master_data()
+    data.update(
+        {
+            "events": json.dumps([{"id": PINNED_EVENT_ID, "eventType": "marathon"}]),
+            "eventCards": json.dumps(
+                [
+                    {
+                        "id": card_id,
+                        "eventId": PINNED_EVENT_ID,
+                        "cardId": card_id,
+                        "bonusRate": 20,
+                        "leaderBonusRate": 0,
+                    }
+                    for card_id in range(1, 6)
+                ]
+            ),
+            "eventDeckBonuses": json.dumps(
+                [
+                    {
+                        "id": index,
+                        "eventId": PINNED_EVENT_ID,
+                        "gameCharacterUnitId": character_id,
+                        "cardAttr": "cute",
+                        "bonusRate": 50,
+                    }
+                    for index, character_id in enumerate(PINNED_BONUS_CHARACTERS, 1)
+                ]
+            ),
+        }
+    )
+    return data
+
+
+class PinnedCharacterTests(unittest.TestCase):
+    """Pinned characters must survive the dfs_ga card priority pre-filter."""
+
+    def setUp(self):
+        self.engine = binding.SekaiDeckRecommend()
+        self.engine.update_masterdata_from_strings(pinned_marathon_master_data(), "jp")
+        self.engine.update_musicmetas_from_string(
+            json.dumps(
+                [
+                    {
+                        "music_id": 1,
+                        "difficulty": "expert",
+                        "music_time": 100,
+                        "event_rate": 100,
+                        "base_score": 1,
+                        "base_score_auto": 1,
+                        "skill_score_solo": [0.1] * 6,
+                        "skill_score_auto": [0.1] * 6,
+                        "skill_score_multi": [0.1] * 6,
+                        "fever_score": 0,
+                        "fever_end_time": 0,
+                        "tap_count": 100,
+                    }
+                ]
+            ),
+            "jp",
+        )
+
+    def recommend(self, algorithm, fixed_characters, leader):
+        options = binding.DeckRecommendOptions.from_dict(
+            {
+                "region": "jp",
+                "user_data_str": wl3_test_user_data([1, 2, 3, 4, 5, 6, 7, 8]),
+                "live_type": "multi",
+                "music_id": 1,
+                "music_diff": "expert",
+                "event_id": PINNED_EVENT_ID,
+                "target": "score",
+                "algorithm": algorithm,
+                "limit": 1,
+                "timeout_ms": 2000,
+                "fixed_characters": fixed_characters,
+                "forcedLeaderCharacterId": leader,
+            }
+        )
+        return self.engine.recommend(options).decks[0]
+
+    def test_pinned_non_bonus_character_keeps_its_cards(self):
+        # Character 2 (card 6) has no event bonus and is filtered out by the
+        # priority tables; dfs_ga used to fail with "no cards to select".
+        for algorithm in ("dfs_ga", "dfs", "ga"):
+            with self.subTest(algorithm=algorithm):
+                deck = self.recommend(algorithm, [1, 2], 1)
+                characters = [WL3_TEST_CARD_CHARACTERS[card.card_id] for card in deck.cards]
+                self.assertEqual(characters[0], 1)
+                self.assertIn(2, characters)
+
+    def test_pinned_character_without_cards_is_rejected(self):
+        # Character 3 has no owned card at all.
+        for algorithm in ("dfs_ga", "dfs"):
+            with self.subTest(algorithm=algorithm):
+                with self.assertRaisesRegex(ValueError, "Fixed character 3 has no usable card"):
+                    self.recommend(algorithm, [1, 3], 1)
+
 
 if __name__ == "__main__":
     unittest.main()