From 74cef5eee7d8d1b77d3d300d9f7cacf50b8e1ea8 Mon Sep 17 00:00:00 2001
From: Horror Proton <107091537+horror-proton@users.noreply.github.com>
Date: Wed, 27 Jul 2022 20:17:12 +0800
Subject: [PATCH] perf: remove an unused task, etc.

---
 src/MeoAssistant/AutoRecruitTask.cpp      |  5 ++---
 src/MeoAssistant/RecruitImageAnalyzer.cpp | 14 --------------
 src/MeoAssistant/RecruitImageAnalyzer.h   |  1 -
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp
index 3fcab79e53..e112652e03 100644
--- a/src/MeoAssistant/AutoRecruitTask.cpp
+++ b/src/MeoAssistant/AutoRecruitTask.cpp
@@ -412,7 +412,7 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc
 
         if (!is_calc_only_task()) {
             // do not confirm, force skip
-            if (std::find(m_confirm_level.cbegin(), m_confirm_level.cend(), final_combination.min_level) == m_confirm_level.cend()) {
+            if (std::none_of(m_confirm_level.cbegin(), m_confirm_level.cend(), [&](const auto& i) { return i == final_combination.min_level; })) {
                 calc_task_result_type result;
                 result.success = true;
                 result.force_skip = true;
@@ -435,7 +435,7 @@ asst::AutoRecruitTask::calc_task_result_type asst::AutoRecruitTask::recruit_calc
         }
 
         // nothing to select, leave the selection empty
-        if (std::find(m_select_level.cbegin(), m_select_level.cend(), final_combination.min_level) == m_select_level.cend()) {
+        if (std::none_of(m_select_level.cbegin(), m_select_level.cend(), [&](const auto& i) { return i == final_combination.min_level; })) {
             calc_task_result_type result;
             result.success = true;
             result.force_skip = false;
@@ -505,7 +505,6 @@ bool asst::AutoRecruitTask::recruit_now()
 
 bool asst::AutoRecruitTask::confirm()
 {
-    // TODO: use RecruitImageAnalyzer::m_confirm_rect or remove it
     // TODO: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/902
     ProcessTask confirm_task(*this, { "RecruitConfirm" });
     return confirm_task.set_retry_times(5).run();
diff --git a/src/MeoAssistant/RecruitImageAnalyzer.cpp b/src/MeoAssistant/RecruitImageAnalyzer.cpp
index 72d7da0754..5ca8d40a2f 100644
--- a/src/MeoAssistant/RecruitImageAnalyzer.cpp
+++ b/src/MeoAssistant/RecruitImageAnalyzer.cpp
@@ -12,7 +12,6 @@ bool asst::RecruitImageAnalyzer::analyze()
     time_analyze();
     refresh_analyze();
     bool ret = tags_analyze();
-    ret &= confirm_analyze();
 
     return ret;
 }
@@ -74,19 +73,6 @@ bool asst::RecruitImageAnalyzer::time_analyze()
     return false;
 }
 
-bool asst::RecruitImageAnalyzer::confirm_analyze()
-{
-    MatchImageAnalyzer confirm_analyzer(m_image);
-    confirm_analyzer.set_task_info("RecruitConfirm");
-
-    if (confirm_analyzer.analyze()) {
-        m_confirm_rect = confirm_analyzer.get_result().rect;
-        return true;
-    }
-
-    return false;
-}
-
 bool asst::RecruitImageAnalyzer::refresh_analyze()
 {
     MatchImageAnalyzer refresh_analyzer(m_image);
diff --git a/src/MeoAssistant/RecruitImageAnalyzer.h b/src/MeoAssistant/RecruitImageAnalyzer.h
index 1207c216cd..b9b08aaa61 100644
--- a/src/MeoAssistant/RecruitImageAnalyzer.h
+++ b/src/MeoAssistant/RecruitImageAnalyzer.h
@@ -43,7 +43,6 @@ namespace asst
         }
         bool tags_analyze();
         bool time_analyze();
-        bool confirm_analyze();
         bool refresh_analyze();
 
         std::vector<TextRect> m_tags_result;