From aca00c85d433641caaf9082d495aa2871eb2d5d4 Mon Sep 17 00:00:00 2001
From: Horror Proton <107091537+horror-proton@users.noreply.github.com>
Date: Tue, 2 Aug 2022 21:59:24 +0800
Subject: [PATCH] perf: change sorting rule of RecruitCombs operator list

---
 src/MeoAssistant/AutoRecruitTask.cpp | 13 +++++++------
 src/MeoAssistant/RecruitConfiger.h   |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp
index 98fec087c6..89f613a26d 100644
--- a/src/MeoAssistant/AutoRecruitTask.cpp
+++ b/src/MeoAssistant/AutoRecruitTask.cpp
@@ -8,6 +8,9 @@
 #include "RecruitConfiger.h"
 #include "Logger.hpp"
 
+#include <algorithm>
+#include <ranges>
+
 namespace asst::recruit_calc
 {
     // all combinations and their operator list, excluding empty set and 6-star operators while there is no senior tag
@@ -297,11 +300,9 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc
         // assuming timer would be set to 09:00:00
         for (RecruitCombs& rc : result_vec) {
             if (rc.min_level < 3) {
-                // find another min level backwards (assuming operator list reversely sorted by level)
-                auto sec = std::find_if(
-                        rc.opers.crbegin(), rc.opers.crend(),
-                        [](const RecruitOperInfo& op) -> bool { return op.level >= 3; });
-                if (sec != rc.opers.crend()) { rc.min_level = sec->level; }
+                // find another min level (assuming operator list sorted in increment order by level)
+                auto sec = std::ranges::find_if(rc.opers, [](const RecruitOperInfo& op) { return op.level >= 3; });
+                if (sec != rc.opers.cend()) { rc.min_level = sec->level; }
             }
         }
 
@@ -351,7 +352,7 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc
                 comb_json["tags"] = json::array(std::move(tags_json_vector));
 
                 std::vector<json::value> opers_json_vector;
-                for (const RecruitOperInfo& oper_info : comb.opers) {
+                for (const RecruitOperInfo& oper_info : std::ranges::reverse_view(comb.opers)) { // print reversely
                     json::value oper_json;
                     oper_json["name"] = oper_info.name;
                     oper_json["level"] = oper_info.level;
diff --git a/src/MeoAssistant/RecruitConfiger.h b/src/MeoAssistant/RecruitConfiger.h
index 35e7ef59d1..34baf78bad 100644
--- a/src/MeoAssistant/RecruitConfiger.h
+++ b/src/MeoAssistant/RecruitConfiger.h
@@ -30,8 +30,8 @@ namespace asst
 
         friend std::strong_ordering operator<=>(const RecruitOperInfo& lhs, const RecruitOperInfo& rhs)
         {
-            if (lhs.level != rhs.level) return rhs.level <=> lhs.level;
-            return lhs.name <=> rhs.name;
+            if (lhs.level != rhs.level) return lhs.level <=> rhs.level; // increment order
+            return rhs.name <=> lhs.name; // decrement order (print reversely)
         }
 
         friend bool operator==(const RecruitOperInfo& lhs, const RecruitOperInfo& rhs)