sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 13:57:26 +08:00
Code Activity

Fix: Series 2 detected as 4 because of noise (fixed #1487)

Browse Source
This commit is contained in:
LmeSzinc
2022-08-06 17:16:05 +08:00
parent b839a1a33b
commit 4beb1a9539
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/research/project.py
View File

@@ -69,6 +69,11 @@ def get_research_series(image):
peaks = [len(signal.find_peaks(row, **parameters)[0]) for row in im[5:-5]] peaks = [len(signal.find_peaks(row, **parameters)[0]) for row in im[5:-5]]
upper, lower = max(peaks), min(peaks) upper, lower = max(peaks), min(peaks)
# print(peaks) # print(peaks)
# Remove noise like [2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 2]
if upper == 3 and lower == 2 and peaks.count(3) <= 2:
upper = 2
if upper == lower and 1 <= upper <= 3: if upper == lower and 1 <= upper <= 3:
series = upper series = upper
elif upper == 3 and lower == 2: elif upper == 3 and lower == 2:
@@ -180,6 +185,11 @@ def get_research_series_jp(image):
peaks = [len(signal.find_peaks(row, **parameters)[0]) for row in im[5:-5]] peaks = [len(signal.find_peaks(row, **parameters)[0]) for row in im[5:-5]]
upper, lower = max(peaks), min(peaks) upper, lower = max(peaks), min(peaks)
# print(upper, lower) # print(upper, lower)
# Remove noise like [2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 2]
if upper == 3 and lower == 2 and peaks.count(3) <= 2:
upper = 2
if upper == lower and 1 <= upper <= 3: if upper == lower and 1 <= upper <= 3:
series = upper series = upper
elif upper == 3 and lower == 2: elif upper == 3 and lower == 2: