質問編集履歴
3
ソースの追加
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -20,9 +20,9 @@
|
|
|
20
20
|
|
|
21
21
|
# a, bは矩形を表すリストで、a=[xmin, xmax, ymin, ymax]
|
|
22
22
|
|
|
23
|
-
ax_mn, ay_mn, ax_mx, ay_mx = a[
|
|
23
|
+
ax_mn, ay_mn, ax_mx, ay_mx = a[2], a[3], a[4], a[5]
|
|
24
24
|
|
|
25
|
-
bx_mn, by_mn, bx_mx, by_mx = b[
|
|
25
|
+
bx_mn, by_mn, bx_mx, by_mx = b[2], b[3], b[4], b[5]
|
|
26
26
|
|
|
27
27
|
|
|
28
28
|
|
|
@@ -54,21 +54,21 @@
|
|
|
54
54
|
|
|
55
55
|
|
|
56
56
|
|
|
57
|
-
def
|
|
57
|
+
def check_ID(IDs, data):
|
|
58
58
|
|
|
59
|
-
for k in IDs:#IDsから登録済みIDを一つずつ呼び出し
|
|
59
|
+
for k in IDs:#IDsから登録済みIDを一つずつ呼び出し
|
|
60
60
|
|
|
61
|
-
if iou(a
|
|
61
|
+
if iou(k, data) <= 0.8:#diffで差分の取得
|
|
62
62
|
|
|
63
|
-
return
|
|
63
|
+
return k[0]
|
|
64
64
|
|
|
65
|
-
return
|
|
65
|
+
return False
|
|
66
66
|
|
|
67
67
|
|
|
68
68
|
|
|
69
69
|
|
|
70
70
|
|
|
71
|
-
IDs =
|
|
71
|
+
IDs = list()#今までに出てきたIDをkey, それに付随する数値をvalueにして格納する
|
|
72
72
|
|
|
73
73
|
with open('out1.csv', 'r', encoding='UTF-8') as f:
|
|
74
74
|
|
|
@@ -82,9 +82,17 @@
|
|
|
82
82
|
|
|
83
83
|
if "ID:" in data[0]:#一要素目がID番号なら
|
|
84
84
|
|
|
85
|
-
|
|
85
|
+
result = check_ID(IDs, data)#重複判定
|
|
86
86
|
|
|
87
|
+
if result:
|
|
88
|
+
|
|
89
|
+
#ヒットすれば、resultに IDが入っているので、dataを書き換える
|
|
90
|
+
|
|
87
|
-
|
|
91
|
+
data[0] = result
|
|
92
|
+
|
|
93
|
+
else:
|
|
94
|
+
|
|
95
|
+
IDs.append(data) #IDsにまるごと登録 これをelseでなくてに出せば全部登録になります。
|
|
88
96
|
|
|
89
97
|
writer.writerow(data)#csv形式で書き込み
|
|
90
98
|
|
2
ソースの追加
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -20,9 +20,9 @@
|
|
|
20
20
|
|
|
21
21
|
# a, bは矩形を表すリストで、a=[xmin, xmax, ymin, ymax]
|
|
22
22
|
|
|
23
|
-
ax_mn, ay_mn, ax_mx, ay_mx = a[
|
|
23
|
+
ax_mn, ay_mn, ax_mx, ay_mx = a[0], a[1], a[2], a[3]
|
|
24
24
|
|
|
25
|
-
bx_mn, by_mn, bx_mx, by_mx = b[
|
|
25
|
+
bx_mn, by_mn, bx_mx, by_mx = b[0], b[1], b[2], b[3]
|
|
26
26
|
|
|
27
27
|
|
|
28
28
|
|
|
@@ -58,9 +58,7 @@
|
|
|
58
58
|
|
|
59
59
|
for k in IDs:#IDsから登録済みIDを一つずつ呼び出し
|
|
60
60
|
|
|
61
|
-
diff = [abs(int(v)-int(d)) for v, d in zip(IDs[k], data[2:])]#登録済みのIDと対象のIDの座標の差分をリストに格納(data[2:]はその要素以降の要素)（absで絶対値）
|
|
62
|
-
|
|
63
|
-
if
|
|
61
|
+
if iou(a,b) <= 0.8:#diffで差分の取得
|
|
64
62
|
|
|
65
63
|
return [k] + data[1:]#ID名を登録済みの番号に変えて値を返す
|
|
66
64
|
|
1
ソースの修正
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -8,13 +8,51 @@
|
|
|
8
8
|
|
|
9
9
|
### 該当のソースコード
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
11
|
```python
|
|
14
12
|
|
|
15
13
|
import pandas as pd
|
|
16
14
|
|
|
17
15
|
import csv
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
def iou(a, b):
|
|
20
|
+
|
|
21
|
+
# a, bは矩形を表すリストで、a=[xmin, xmax, ymin, ymax]
|
|
22
|
+
|
|
23
|
+
ax_mn, ay_mn, ax_mx, ay_mx = a[3], a[4], a[5], a[6]
|
|
24
|
+
|
|
25
|
+
bx_mn, by_mn, bx_mx, by_mx = b[3], b[4], b[5], b[6]
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
a_area = (ax_mx - ax_mn + 1) * (ay_mx - ay_mn + 1)
|
|
30
|
+
|
|
31
|
+
b_area = (bx_mx - bx_mn + 1) * (by_mx - by_mn + 1)
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
abx_mn = max(ax_mn, bx_mn)
|
|
36
|
+
|
|
37
|
+
aby_mn = max(ay_mn, by_mn)
|
|
38
|
+
|
|
39
|
+
abx_mx = min(ax_mx, bx_mx)
|
|
40
|
+
|
|
41
|
+
aby_mx = min(ay_mx, by_mx)
|
|
42
|
+
|
|
43
|
+
w = max(0, abx_mx - abx_mn + 1)
|
|
44
|
+
|
|
45
|
+
h = max(0, aby_mx - aby_mn + 1)
|
|
46
|
+
|
|
47
|
+
intersect = w*h
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
|
|
51
|
+
iou = intersect / (a_area + b_area - intersect)
|
|
52
|
+
|
|
53
|
+
return iou
|
|
54
|
+
|
|
55
|
+
|
|
18
56
|
|
|
19
57
|
def renumber(IDs, data):
|
|
20
58
|
|
|
@@ -46,55 +84,13 @@
|
|
|
46
84
|
|
|
47
85
|
if "ID:" in data[0]:#一要素目がID番号なら
|
|
48
86
|
|
|
49
|
-
data = renumber(IDs, data)#
|
|
87
|
+
data = renumber(IDs, data)#重複判定
|
|
50
88
|
|
|
51
89
|
IDs[data[0]] = data[2:]#IDsに登録
|
|
52
90
|
|
|
53
91
|
writer.writerow(data)#csv形式で書き込み
|
|
54
92
|
|
|
55
93
|
```
|
|
56
|
-
|
|
57
|
-
```python
|
|
58
|
-
|
|
59
|
-
def iou(a, b):
|
|
60
|
-
|
|
61
|
-
# a, bは矩形を表すリストで、a=[xmin, xmax, ymin, ymax]
|
|
62
|
-
|
|
63
|
-
ax_mn, ay_mn, ax_mx, ay_mx = a[0], a[1], a[2], a[3]
|
|
64
|
-
|
|
65
|
-
bx_mn, by_mn, bx_mx, by_mx = b[0], b[1], b[2], b[3]
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
a_area = (ax_mx - ax_mn + 1) * (ay_mx - ay_mn + 1)
|
|
70
|
-
|
|
71
|
-
b_area = (bx_mx - bx_mn + 1) * (by_mx - by_mn + 1)
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
abx_mn = max(ax_mn, bx_mn)
|
|
76
|
-
|
|
77
|
-
aby_mn = max(ay_mn, by_mn)
|
|
78
|
-
|
|
79
|
-
abx_mx = min(ax_mx, bx_mx)
|
|
80
|
-
|
|
81
|
-
aby_mx = min(ay_mx, by_mx)
|
|
82
|
-
|
|
83
|
-
w = max(0, abx_mx - abx_mn + 1)
|
|
84
|
-
|
|
85
|
-
h = max(0, aby_mx - aby_mn + 1)
|
|
86
|
-
|
|
87
|
-
intersect = w*h
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
iou = intersect / (a_area + b_area - intersect)
|
|
92
|
-
|
|
93
|
-
return iou
|
|
94
|
-
|
|
95
|
-
```
|
|
96
|
-
|
|
97
|
-
|
|
98
94
|
|
|
99
95
|
### 試したこと
|
|
100
96
|
|