Update to v0.50.15.

Author: Mysticial

Common/Cpp/LifetimeSanitizer.h

@@ -131,7 +131,7 @@ class LifetimeSanitizer{
 private:
     uint64_t m_token;
     void* m_self;
-    std::string m_name;
+    const char* m_name;
 };
 
 

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -22,10 +22,10 @@ namespace PokemonAutomation{
 //  misleading version information.
 //
 
-const bool IS_BETA_VERSION = true;
+const bool IS_BETA_VERSION = false;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 50;
-const int PROGRAM_VERSION_PATCH = 14;
+const int PROGRAM_VERSION_PATCH = 15;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_arm64_NEON.cpp

@@ -10,6 +10,7 @@
 #include "Kernels_BinaryImage_BasicFilters_Routines.h"
 #include "Kernels_BinaryImage_BasicFilters_arm64_NEON.h"
 
+
 namespace PokemonAutomation{
 namespace Kernels{
 
@@ -24,6 +25,8 @@ void filter_by_mask_64x8_arm64_NEON(
 }
 
 
+
+
 void compress_rgb32_to_binary_range_64x8_arm64_NEON(
     const uint32_t* image, size_t bytes_per_row,
     PackedBinaryMatrix_IB& matrix0, uint32_t mins0, uint32_t maxs0

SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_arm64_NEON.h

@@ -9,9 +9,9 @@
 
 #include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+// #include <iostream>
+// using std::cout;
+// using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -149,8 +149,6 @@ class FilterByMask_arm64_NEON{
     const uint32x4_t m_zeros;
 };
 
-
-
 // Compress given pixels buffer (of up to 64-pixel long) into bit map and store in one uint64_t.
 class Compressor_RgbRange_arm64_NEON{
 public:
@@ -178,13 +176,14 @@ class Compressor_RgbRange_arm64_NEON{
             bits |= convert16(pixels + c) << c;
             c += 16;
         }
-        for(; c < count; c += 4){
+
+        count %= 16;
+        for(size_t i = 0; i < count / 4; i++, c+=4){
             const uint8x16_t pixel = vld1q_u8((const uint8_t*)(pixels + c));
             bits |= convert4(pixel) << c;
         }
         count %= 4;
         if (count){
-            c -= 4;
             PartialWordAccess_arm64_NEON loader(count * sizeof(uint32_t));
             const uint8x16_t pixel = loader.load(pixels + c);
             const uint64_t mask = ((uint64_t)1 << count) - 1;
@@ -273,6 +272,7 @@ class Compressor_RgbEuclidean_arm64_NEON{
         for(size_t i = 0; i < count / 4; i++, c+=4){
             bits |= convert4(pixels + c) << c;
         }
+        count %= 4;
         if (count){
             PartialWordAccess_arm64_NEON loader(count * sizeof(uint32_t));
             const uint8x16_t pixel = loader.load(pixels + c);

SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.tpp

@@ -16,9 +16,9 @@
 #include "Kernels/BinaryMatrix/Kernels_SparseBinaryMatrixCore.h"
 #include "Kernels_Waterfill_Session.h"
 
-//#include <iostream>
-//using std::cout;
-//using std::endl;
+// #include <iostream>
+// using std::cout;
+// using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -125,7 +125,9 @@
 #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 "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h"
 
 
 #include <QPixmap>
@@ -277,9 +279,17 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     BotBaseContext context(scope, console.botbase());
     VideoOverlaySet overlays(overlay);
 
+#if 0
+    PokemonSwSh::MaxLairInternal::PokemonSwapMenuReader reader(console, overlay, Language::English);
+
+    ImageRGB32 image("20241221-123730238930.png");
+
+    double hp[4];
+    reader.read_hp(image, hp);
+#endif
 
+//    reader.read_opponent_in_summary(logger, image);
 
-//    ImageRGB32 image("Screenshot.png");
 //    PokemonSwSh::find_selection_arrows(image, 10);
 
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp

@@ -112,6 +112,7 @@ bool DateReader::detect(const ImageViewRGB32& screen) const{
 
     return true;
 }
+#if 0
 int8_t DateReader::read_hours(Logger& logger, const ImageViewRGB32& screen) const{
     if (!detect(screen)){
         return -1;
@@ -158,7 +159,9 @@ int8_t DateReader::read_hours(Logger& logger, const ImageViewRGB32& screen) cons
         }
         return (int8_t)hours;
     }
+
 }
+#endif
 
 
 void DateReader::set_hours(
@@ -187,7 +190,9 @@ void DateReader::set_hours(
 
         //  Read the hour.
         VideoSnapshot snapshot = console.video().snapshot();
-        int8_t current_hour = read_hours(console.logger(), snapshot);
+//        int8_t current_hour = read_hours(console, snapshot);
+        int8_t current_hour = read_date(console, snapshot).second.hour;
+
         if (current_hour < 0){
             throw_and_log<FatalProgramException>(
                 console, ErrorReport::SEND_ERROR_REPORT,

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.h

@@ -39,7 +39,7 @@ class DateReader : public StaticScreenDetector{
 
     //  Read the hours (0 - 23) while on the date change window.
     //  Returns -1 if unable to read.
-    int8_t read_hours(Logger& logger, const ImageViewRGB32& screen) const;
+//    int8_t read_hours(Logger& logger, std::shared_ptr<const ImageRGB32> screen) const;
 
     void set_hours(
         const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,

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;
 
 };