FRLG tests, adjust dialog detectors

Author: kichithewolf

SerialPrograms/Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp

@@ -39,9 +39,9 @@ bool WhiteDialogDetector::detect(const ImageViewRGB32& screen){
     ImageViewRGB32 right_image = extract_box_reference(screen, m_right_box);
     ImageViewRGB32 top_image = extract_box_reference(screen, m_top_box);
     ImageViewRGB32 bottom_image = extract_box_reference(screen, m_bottom_box);
-    if (is_solid(right_image, { 0.25, 0.38, 0.369 })
-        && is_solid(top_image, { 0.25, 0.38, 0.369 })
-        && is_solid(bottom_image, { 0.25, 0.38, 0.369 })
+    if (is_solid(right_image, { 0.333333, 0.333333, 0.333333 })
+        && is_solid(top_image, { 0.333333, 0.333333, 0.333333 })
+        && is_solid(bottom_image, { 0.333333, 0.333333, 0.333333 })
         ){
         return true;
     }
@@ -81,11 +81,11 @@ bool AdvanceWhiteDialogDetector::detect(const ImageViewRGB32& screen){
     ImageViewRGB32 top_image = extract_box_reference(screen, m_top_box);
     ImageViewRGB32 bottom_image = extract_box_reference(screen, m_bottom_box);
 
-    if (is_solid(right_image, { 0.25, 0.38, 0.369 })
-        && is_solid(top_image, { 0.25, 0.38, 0.369 })
-        && is_solid(bottom_image, { 0.25, 0.38, 0.369 })
-        && (stats.average.r > stats.average.b + 200)
-        && (stats.average.r > stats.average.g + 200)
+    if (is_solid(right_image, { 0.333333, 0.333333, 0.333333 })
+        && is_solid(top_image, { 0.333333, 0.333333, 0.333333 })
+        && is_solid(bottom_image, { 0.333333, 0.333333, 0.333333 })
+        && (stats.average.r > stats.average.b + 180)
+        && (stats.average.r > stats.average.g + 180)
         )
     {
         return true;
@@ -110,10 +110,10 @@ bool SelectionDialogDetector::detect(const ImageViewRGB32& screen){
     ImageViewRGB32 top_image = extract_box_reference(screen, m_top_box);
     ImageViewRGB32 bottom_image = extract_box_reference(screen, m_bottom_box);
     ImageViewRGB32 selection_image = extract_box_reference(screen, m_selection_box);
-    if (is_solid(right_image, { 0.25, 0.38, 0.369 })
-        && is_solid(top_image, { 0.25, 0.38, 0.369 })
-        && is_solid(bottom_image, { 0.25, 0.38, 0.369 })
-        && is_solid(selection_image, { 0.25, 0.38, 0.369 })
+    if (is_solid(right_image, { 0.333333, 0.333333, 0.333333 })
+        && is_solid(top_image, { 0.333333, 0.333333, 0.333333 })
+        && is_solid(bottom_image, { 0.333333, 0.333333, 0.333333 })
+        && is_solid(selection_image, { 0.333333, 0.333333, 0.333333 })
         ){
         return true;
     }

SerialPrograms/Source/Tests/PokemonFRLG_Tests.cpp

@@ -0,0 +1,36 @@
+/*  PokemonFRLG Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "CommonFramework/Logging/Logger.h"
+#include "PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "PokemonFRLG_Tests.h"
+#include "TestUtils.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Recording/StreamHistorySession.h"
+#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+#include <iostream>
+using std::cout;
+using std::cerr;
+using std::endl;
+
+namespace PokemonAutomation{
+
+using namespace NintendoSwitch;
+using namespace NintendoSwitch::PokemonFRLG;
+
+int test_pokemonFRLG_AdvanceWhiteDialogDetector(const ImageViewRGB32& image, bool target){
+    auto overlay = DummyVideoOverlay();
+    AdvanceWhiteDialogDetector detector(COLOR_RED);
+    bool result = detector.detect(image);
+    TEST_RESULT_EQUAL(result, target);
+    return 0;
+}
+
+}

SerialPrograms/Source/Tests/PokemonFRLG_Tests.h

@@ -0,0 +1,24 @@
+/*  PokemonFRLG Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ */
+
+
+#ifndef PokemonAutomation_Tests_PokemonFRLG_Tests_H
+#define PokemonAutomation_Tests_PokemonFRLG_Tests_H
+
+#include <vector>
+#include <string>
+
+namespace PokemonAutomation{
+
+class ImageViewRGB32;
+
+
+int test_pokemonFRLG_AdvanceWhiteDialogDetector(const ImageViewRGB32& image, bool target);
+
+}
+
+#endif

SerialPrograms/Source/Tests/TestMap.cpp

@@ -9,6 +9,7 @@
 #include "CommonFramework_Tests.h"
 #include "Kernels_Tests.h"
 #include "NintendoSwitch_Tests.h"
+#include "PokemonFRLG_Tests.h"
 #include "PokemonHome_Tests.h"
 #include "PokemonLA_Tests.h"
 #include "PokemonLZA_Tests.h"
@@ -308,6 +309,7 @@ const std::map<std::string, TestFunction> TEST_MAP = {
     {"PokemonLZA_HyperspaceCalorieDetector", std::bind(image_int_detector_helper, test_pokemonLZA_HyperspaceCalorieDetector, _1)},
     {"PokemonLZA_FlavorPowerScreenDetector", test_pokemonLZA_FlavorPowerScreenDetector},
     {"PokemonLZA_DonutBerriesReader", test_pokemonLZA_DonutBerriesReader},
+    {"PokemonFRLG_AdvanceWhiteDialogDetector", std::bind(image_bool_detector_helper, test_pokemonFRLG_AdvanceWhiteDialogDetector, _1)},
 };
 
 TestFunction find_test_function(const std::string& test_space, const std::string& test_name){

SerialPrograms/cmake/SourceFiles.cmake

@@ -2660,6 +2660,8 @@ file(GLOB LIBRARY_SOURCES
     Source/Tests/Kernels_Tests.h
     Source/Tests/NintendoSwitch_Tests.cpp
     Source/Tests/NintendoSwitch_Tests.h
+    Source/Tests/PokemonFRLG_Tests.cpp
+    Source/Tests/PokemonFRLG_Tests.h
     Source/Tests/PokemonHome_Tests.cpp
     Source/Tests/PokemonHome_Tests.h
     Source/Tests/PokemonLA_Tests.cpp