Sourcery refactored master branch #1

sourcery-ai · 2023-07-21T06:17:10Z

Branch master refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai

Due to GitHub API limits, only the first 60 comments can be shown.

sourcery-ai · 2023-07-21T06:17:11Z

Tools工具包/OpenCV_Window_Management/opencv_windows_management.py

-        self.windows = dict()
+        self.windows = {}


Function opencv_windows_management.__init__ refactored with the following changes:

Replace dict() with {} (dict-literal)

sourcery-ai · 2023-07-21T06:17:12Z

ch04-图片/show_image.py

@@ -12,6 +12,7 @@

 """



Lines 39-46 refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

Swap positions of nested conditionals (swap-nested-ifs)

Hoist nested repeated code outside conditional statements (hoist-similar-statement-from-if)

This removes the following comments ( why? ):

#TODO 分辨率太大，需要缩放 # if t.any(): # if temp == img: # t = temp == img # if t.all():

sourcery-ai · 2023-07-21T06:17:12Z

ch05-视频/5.VideoPlay.py

-cv2.imshow('frame_no'+str(frame_no), frame)
+cv2.imshow(f'frame_no{frame_no}', frame)


Lines 27-27 refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

Remove unnecessary calls to str() from formatted values in f-strings (remove-str-from-fstring)

sourcery-ai · 2023-07-21T06:17:12Z

ch05-视频/5.VideoWriter.py

-    if ret is True:
-
-        frame = cv2.resize(frame, (640, 480))
+    if ret is not True:
+        break

-        # write the flipped frame
-        out.write(frame)
+    frame = cv2.resize(frame, (640, 480))

-        cv2.imshow('frame', frame)
+    # write the flipped frame
+    out.write(frame)

-    else:
-        break
+    cv2.imshow('frame', frame)


Lines 21-31 refactored with the following changes:

Swap if/else branches (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2023-07-21T06:17:12Z

ch05-视频/VideoCaptureOnePicture.py

-        cv2.imwrite(id_generator() + '.jpg', frame)
+        cv2.imwrite(f'{id_generator()}.jpg', frame)


Lines 32-32 refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-07-21T06:17:15Z

ch22-直方图/hist.py

-    y = np.flipud(h)
-    return y
+    return np.flipud(h)


Function hist_curve refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-07-21T06:17:15Z

ch24-模板匹配/24.1-OpenCV中的模板匹配-matchTemplate.py

-    plt.suptitle('method: ' + meth)
+    plt.suptitle(f'method: {meth}')


Lines 56-56 refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-07-21T06:17:15Z

ch26-Hough圆环变换/HoughCircles_camera.py

-        cv2.imwrite(id_generator() + '.jpg', frame2)
+        cv2.imwrite(f'{id_generator()}.jpg', frame2)

    # Capture frame-by-frame
    ret, frame = cap.read()
    m = mse(cv2.cvtColor(temp, cv2.COLOR_BGR2GRAY), cv2.cvtColor(frame, cv2.COLOR_BGR2GRAY))
    print('mse', m, '----\n')
-    if abs(m - tm) < 2:  # 静止画面，不用重复计算
+    if abs(m - tm) < 2:
        continue
-    else:
-        temp = frame.copy()
-        tm = m
+    temp = frame.copy()
+    tm = m


Lines 53-63 refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

Remove unnecessary else after guard condition (remove-unnecessary-else)

This removes the following comments ( why? ):

# 静止画面，不用重复计算

sourcery-ai · 2023-07-21T06:17:15Z

ch26-Hough圆环变换/HoughCircles_chess.py

-    txt = 'black'
    gray = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
    ret, threshold = cv2.threshold(gray, 100, 255, cv2.THRESH_BINARY)

    c = Counter(list(threshold.flatten()))
    print(c.most_common())
-    if c.most_common()[0][0] != 0:
-        txt = 'white'
+    txt = 'white' if c.most_common()[0][0] != 0 else 'black'


Function detect_weiqi refactored with the following changes:

Move assignment closer to its usage within a block (move-assign-in-block)

Move setting of default value for variable into else branch (introduce-default-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-07-21T06:17:15Z

ch37-特征匹配/37.4-SIFT_match.py

-# Apply ratio test
-# 比值测试，首先获取与 A距离最近的点 B （最近）和 C （次近），
-# 只有当 B/C 小于阀值时（0.75）才被认为是匹配，
-# 因为假设匹配是一一对应的，真正的匹配的理想距离为0
-good = []
-for m, n in matches:
-    if m.distance < 0.75 * n.distance:
-        good.append([m])
-
+good = [[m] for m, n in matches if m.distance < 0.75 * n.distance]


Lines 28-36 refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

This removes the following comments ( why? ):

# Apply ratio test # 比值测试，首先获取与 A距离最近的点 B （最近）和 C （次近）， # 因为假设匹配是一一对应的，真正的匹配的理想距离为0 # 只有当 B/C 小于阀值时（0.75）才被认为是匹配，

sourcery-ai · 2023-07-21T06:17:18Z

ch37-特征匹配/37.5-FLANN匹配器.py

@@ -15,6 +15,7 @@



Lines 41-41 refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2023-07-21T06:17:19Z

ch38-使用特征匹配和单应性查找对象/findHomography.py

@@ -8,6 +8,7 @@
 findHomography.py:联合使用特征提取和 calib3d 模块中的 findHomography 在复杂图像中查找已知对象
 """



Lines 31-35 refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

This removes the following comments ( why? ):

# store all the good matches as per Lowe's ratio test.

sourcery-ai · 2023-07-21T06:17:19Z

ch43-姿势估计/calib3d.py

-            cv2.imwrite(fname[:6] + '.png', img)
+            cv2.imwrite(f'{fname[:6]}.png', img)


Lines 75-75 refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-07-21T06:17:19Z

ch44-对极几何/code.py

-for i, (m, n) in enumerate(matches):
+for m, n in matches:


Lines 67-67 refactored with the following changes:

Remove unnecessary calls to enumerate when the index is not used (remove-unused-enumerate)

sourcery-ai · 2023-07-21T06:17:19Z

ch47-支持向量机/47.2-使用SVM进行-手写数据OCR.py

-    hist = np.hstack(hists)  # hist is a 64 bit vector
-    return hist
+    return np.hstack(hists)


Function hog refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

This removes the following comments ( why? ):

# hist is a 64 bit vector

sourcery-ai · 2023-07-21T06:17:22Z

my06-验证码识别/solving_captchas_code_examples/extract_single_letters_from_captchas.py

-    print("[INFO] processing image {}/{}".format(i + 1, len(captcha_image_files)))
+    print(f"[INFO] processing image {i + 1}/{len(captcha_image_files)}")


Lines 18-88 refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

Merge consecutive list appends into a single extend (merge-list-appends-into-extend)

sourcery-ai · 2023-07-21T06:17:22Z

my06-验证码识别/solving_captchas_code_examples/solve_captchas_with_model.py

-            letter_image_regions.append((x, y, half_width, h))
-            letter_image_regions.append((x + half_width, y, half_width, h))
+            letter_image_regions.extend(
+                ((x, y, half_width, h), (x + half_width, y, half_width, h))
+            )


Lines 60-108 refactored with the following changes:

Merge consecutive list appends into a single extend (merge-list-appends-into-extend)

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2023-07-21T06:17:22Z

my08-opencv玩游戏game/连连看/compare_photos.py

-    # taking only 10% of histogram diff, since it's less accurate than template method
-    commutative_image_diff = (img_hist_diff / 10) + img_template_diff
-    return commutative_image_diff
+    return (img_hist_diff / 10) + img_template_diff


Function get_image_difference refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

This removes the following comments ( why? ):

# taking only 10% of histogram diff, since it's less accurate than template method

sourcery-ai · 2023-07-21T06:17:23Z

my10-识别二维码/QR_Scaner1.py

-        text = "{} ({})".format(barcodeData, barcodeType)
+        text = f"{barcodeData} ({barcodeType})"
        cv2.putText(image, text, (x, y - 10), cv2.FONT_HERSHEY_SIMPLEX,
                    0.5, (0, 0, 255), 2)

        # print the barcode type and data to the terminal
-        print("[INFO] Found {} barcode: {}".format(barcodeType, barcodeData))
+        print(f"[INFO] Found {barcodeType} barcode: {barcodeData}")


Function main refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

sourcery-ai · 2023-07-21T06:17:23Z

官方samples/_coverage.py

@@ -4,6 +4,7 @@
 Utility for measuring python opencv API coverage by samples.
 '''



Lines 15-15 refactored with the following changes:

Replace list(), dict() or set() with comprehension (collection-builtin-to-comprehension)

Replace unneeded comprehension with generator (comprehension-to-generator)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2023-07-21T06:17:27Z

官方samples/asift.py

-    if pool is None:
-        ires = it.imap(f, params)
-    else:
-        ires = pool.imap(f, params)
-
+    ires = it.imap(f, params) if pool is None else pool.imap(f, params)


Function affine_detect refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-07-21T06:17:27Z

官方samples/calibrate.py

@@ -13,6 +13,7 @@
    <image mask> defaults to ../data/left*.jpg
 '''



Lines 37-109 refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

Replace interpolated string formatting with f-string [×2] (replace-interpolation-with-fstring)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

This removes the following comments ( why? ):

# default

sourcery-ai · 2023-07-21T06:17:27Z

官方samples/common.py

-    M = np.float64([[ cx,  0, tx],
-                    [  0, cy, ty],
-                    [  0,  0,  1]])
-    return M
+    return np.float64([[cx, 0, tx], [0, cy, ty], [0, 0, 1]])


Function rect2rect_mtx refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-07-21T06:17:27Z

官方samples/common.py

-    if PY3:
-        output = it.zip_longest(fillvalue=fillvalue, *args)
-    else:
-        output = it.izip_longest(fillvalue=fillvalue, *args)
-    return output
+    return (
+        it.zip_longest(fillvalue=fillvalue, *args)
+        if PY3
+        else it.izip_longest(fillvalue=fillvalue, *args)
+    )


Function grouper refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-07-21T06:17:27Z

官方samples/common.py

-    if PY3:
-        img0 = next(imgs)
-    else:
-        img0 = imgs.next()
+    img0 = next(imgs) if PY3 else imgs.next()


Function mosaic refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-07-21T06:17:29Z

官方samples/fitline.py

-if PY3:
-    cur_func_name = next(dist_func_names)
-else:
-    cur_func_name = dist_func_names.next()
+cur_func_name = next(dist_func_names) if PY3 else dist_func_names.next()


Lines 52-55 refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-07-21T06:17:29Z

官方samples/fitline.py

-            if PY3:
-                cur_func_name = next(dist_func_names)
-            else:
-                cur_func_name = dist_func_names.next()
+            cur_func_name = next(dist_func_names) if PY3 else dist_func_names.next()


Lines 93-96 refactored with the following changes:

Swap positions of nested conditionals (swap-nested-ifs)

Hoist nested repeated code outside conditional statements (hoist-similar-statement-from-if)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-07-21T06:17:30Z

官方samples/gaussian_mix.py

-    for i in xrange(cluster_n):
+    for _ in xrange(cluster_n):


Function make_gaussians refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2023-07-21T06:17:30Z

官方samples/hist.py

-    y=np.flipud(h)
-    return y
+    return np.flipud(h)


Function hist_curve refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-07-21T06:17:30Z

官方samples/houghlines.py

@@ -8,6 +8,7 @@
    image argument defaults to ../data/pic1.png
 '''



Lines 31-51 refactored with the following changes:

Remove redundant conditional (remove-redundant-if)

This removes the following comments ( why? ):

# HoughLines # HoughLinesP

'Refactored by Sourcery'

9a32408

sourcery-ai bot requested a review from schild July 21, 2023 06:17

sourcery-ai bot commented Jul 21, 2023

View reviewed changes

		cv2.imshow('frame_no'+str(frame_no), frame)
		cv2.imshow(f'frame_no{frame_no}', frame)

		cv2.imwrite(id_generator() + '.jpg', frame)
		cv2.imwrite(f'{id_generator()}.jpg', frame)

		plt.suptitle('method: ' + meth)
		plt.suptitle(f'method: {meth}')

		@@ -8,6 +8,7 @@
		findHomography.py:联合使用特征提取和 calib3d 模块中的 findHomography 在复杂图像中查找已知对象
		"""

		cv2.imwrite(fname[:6] + '.png', img)
		cv2.imwrite(f'{fname[:6]}.png', img)

		print("[INFO] processing image {}/{}".format(i + 1, len(captcha_image_files)))
		print(f"[INFO] processing image {i + 1}/{len(captcha_image_files)}")

		@@ -4,6 +4,7 @@
		Utility for measuring python opencv API coverage by samples.
		'''

		@@ -13,6 +13,7 @@
		<image mask> defaults to ../data/left*.jpg
		'''

		@@ -8,6 +8,7 @@
		image argument defaults to ../data/pic1.png
		'''

Sourcery refactored master branch #1

Are you sure you want to change the base?

Sourcery refactored master branch #1

Uh oh!

Conversation

sourcery-ai bot commented Jul 21, 2023

Uh oh!

sourcery-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 21, 2023