Improve AutoDA name-read disambiguation tolerance.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -125,7 +125,8 @@
 #include "PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h"
 #include "PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.h"
 #include "PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h"
-
+//#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
 
 
 #include <QPixmap>
@@ -278,8 +279,12 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
+    PokemonSwSh::MaxLairInternal::BattleMenuReader reader(console, Language::Korean);
+
+    ImageRGB32 image("20241220-161934162025.png");
+
+    reader.read_opponent_in_summary(logger, image);
 
-//    ImageRGB32 image("Screenshot.png");
 //    PokemonSwSh::find_selection_arrows(image, 10);
 
 
@@ -331,7 +336,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     );
 #endif
 
-#if 1
+#if 0
     VideoSnapshot image = feed.snapshot();
 //    ImageRGB32 image("screenshot-20241124-135028529403.png");
 

SerialPrograms/Source/Pokemon/Inference/Pokemon_NameReader.cpp

@@ -29,11 +29,12 @@ OCR::StringMatchResult PokemonNameReader::read_substring(
     Language language,
     const ImageViewRGB32& image,
     const std::vector<OCR::TextColorRange>& text_color_ranges,
-    double min_text_ratio, double max_text_ratio
+    double min_text_ratio, double max_text_ratio,
+    double max_log10p
 ) const{
     return match_substring_from_image_multifiltered(
         &logger, language, image, text_color_ranges,
-        MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
+        max_log10p, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
     );
 }
 

SerialPrograms/Source/Pokemon/Inference/Pokemon_NameReader.h

@@ -31,7 +31,8 @@ class PokemonNameReader : public OCR::LargeDictionaryMatcher{
         Language language,
         const ImageViewRGB32& image,
         const std::vector<OCR::TextColorRange>& text_color_ranges,
-        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50,
+        double max_log10p = MAX_LOG10P
     ) const;
 
 };

SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.cpp

@@ -254,30 +254,36 @@ std::set<std::string> BattleMenuReader::read_opponent(
 }
 std::set<std::string> BattleMenuReader::read_opponent_in_summary(Logger& logger, const ImageViewRGB32& screen) const{
     ImageViewRGB32 name = extract_box_reference(screen, m_summary_opponent_name);
-    std::set<std::string> slugs = read_pokemon_name(logger, m_language, name);
+
+    //  We can use a weaker threshold here since we are cross-checking with the type.
+    std::set<std::string> slugs = read_pokemon_name(logger, m_language, name, -1.0);
 
     ImageViewRGB32 types = extract_box_reference(screen, m_summary_opponent_types);
     std::multimap<double, std::pair<PokemonType, ImagePixelBox>> candidates = find_symbols(types, 0.2);
-//    for (const auto& item : candidates){
-//        cout << get_type_slug(item.second.first) << ": " << item.first << endl;
-//    }
+
+    std::string type_str = "Type Read Result:\n";
+    for (const auto& item : candidates){
+        type_str += "    " + get_type_slug(item.second.first) + " : " + tostr_default(item.first ) + "\n";
+    }
+    logger.log(type_str);
 
     PokemonType type0 = PokemonType::NONE;
     PokemonType type1 = PokemonType::NONE;
     {
         auto iter = candidates.begin();
         if (iter != candidates.end()){
             type0 = iter->second.first;
-            iter++;
+            ++iter;
         }
         if (iter != candidates.end()){
             type1 = iter->second.first;
-            iter++;
+            ++iter;
         }
     }
 
     for (auto iter = slugs.begin(); iter != slugs.end();){
         const MaxLairMon& mon = get_maxlair_mon(*iter);
+//        cout << mon.species << endl;
         if ((type0 == mon.type[0] && type1 == mon.type[1]) || (type0 == mon.type[1] && type1 == mon.type[0])){
             ++iter;
         }else{

SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp

@@ -108,15 +108,18 @@ std::string read_boss_sprite(ConsoleHandle& console){
 
 std::set<std::string> read_pokemon_name(
     Logger& logger, Language language,
-    const ImageViewRGB32& image
+    const ImageViewRGB32& image,
+    double max_log10p
 ){
     const SpeciesReadDatabase& database = SpeciesReadDatabase::instance();
 
 //    OCR::MatchResult result = PokemonNameReader::instance().read_substring(language, image);
 //    image.save("test.png");
     OCR::StringMatchResult result = database.name_reader->read_substring(
         logger, language, image,
-        OCR::BLACK_OR_WHITE_TEXT_FILTERS()
+        OCR::BLACK_OR_WHITE_TEXT_FILTERS(),
+        0.01, 0.50,
+        max_log10p
     );
 //    result.log(logger);
     if (result.results.empty()){

SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h

@@ -24,7 +24,8 @@ std::string read_boss_sprite(ConsoleHandle& console);
 //  OCR the Pokemon name and return all possible candidates.
 std::set<std::string> read_pokemon_name(
     Logger& logger, Language language,
-    const ImageViewRGB32& image
+    const ImageViewRGB32& image,
+    double max_log10p = -1.4
 );