From 62084d6733a78822f39dd8a1fe01c77eea281a65 Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Sat, 08 Sep 2018 04:11:49 +0000
Subject: [PATCH] More testing stuffs
---
data/test13.jpg | 0
data/test15.jpg | 0
data/test18.jpg | 0
data/test2.mp4 | 0
data/test9.jpg | 0
data/test10.jpg | 0
transform_data.py | 8 ++++----
data/test21.jpg | 0
data/test19.jpg | 0
data/test20.jpg | 0
data/test14.jpg | 0
data/test7.jpg | 0
data/test12.jpg | 0
data/test1.mp4 | 0
data/test17.jpg | 0
data/test16.jpg | 0
data/test8.jpg | 0
data/test11.jpg | 0
setup_train.py | 8 ++++----
generate_data.py | 8 ++++----
20 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/data/test1.mp4 b/data/test1.mp4
new file mode 100644
index 0000000..114a43c
--- /dev/null
+++ b/data/test1.mp4
Binary files differ
diff --git a/data/test10.jpg b/data/test10.jpg
new file mode 100644
index 0000000..8e9062b
--- /dev/null
+++ b/data/test10.jpg
Binary files differ
diff --git a/data/test11.jpg b/data/test11.jpg
new file mode 100644
index 0000000..b0795f4
--- /dev/null
+++ b/data/test11.jpg
Binary files differ
diff --git a/data/test12.jpg b/data/test12.jpg
new file mode 100644
index 0000000..c2f5de6
--- /dev/null
+++ b/data/test12.jpg
Binary files differ
diff --git a/data/test13.jpg b/data/test13.jpg
new file mode 100644
index 0000000..878cbad
--- /dev/null
+++ b/data/test13.jpg
Binary files differ
diff --git a/data/test14.jpg b/data/test14.jpg
new file mode 100644
index 0000000..bf5094a
--- /dev/null
+++ b/data/test14.jpg
Binary files differ
diff --git a/data/test15.jpg b/data/test15.jpg
new file mode 100644
index 0000000..39f1dd4
--- /dev/null
+++ b/data/test15.jpg
Binary files differ
diff --git a/data/test16.jpg b/data/test16.jpg
new file mode 100644
index 0000000..c514771
--- /dev/null
+++ b/data/test16.jpg
Binary files differ
diff --git a/data/test17.jpg b/data/test17.jpg
new file mode 100644
index 0000000..4ad12f7
--- /dev/null
+++ b/data/test17.jpg
Binary files differ
diff --git a/data/test18.jpg b/data/test18.jpg
new file mode 100644
index 0000000..a0f9390
--- /dev/null
+++ b/data/test18.jpg
Binary files differ
diff --git a/data/test19.jpg b/data/test19.jpg
new file mode 100644
index 0000000..8f3c5a6
--- /dev/null
+++ b/data/test19.jpg
Binary files differ
diff --git a/data/test2.mp4 b/data/test2.mp4
new file mode 100644
index 0000000..aa08b4b
--- /dev/null
+++ b/data/test2.mp4
Binary files differ
diff --git a/data/test20.jpg b/data/test20.jpg
new file mode 100644
index 0000000..8717d5f
--- /dev/null
+++ b/data/test20.jpg
Binary files differ
diff --git a/data/test21.jpg b/data/test21.jpg
new file mode 100644
index 0000000..342577c
--- /dev/null
+++ b/data/test21.jpg
Binary files differ
diff --git a/data/test7.jpg b/data/test7.jpg
new file mode 100644
index 0000000..82dfb3c
--- /dev/null
+++ b/data/test7.jpg
Binary files differ
diff --git a/data/test8.jpg b/data/test8.jpg
new file mode 100644
index 0000000..2d480ce
--- /dev/null
+++ b/data/test8.jpg
Binary files differ
diff --git a/data/test9.jpg b/data/test9.jpg
new file mode 100644
index 0000000..c8b0f53
--- /dev/null
+++ b/data/test9.jpg
Binary files differ
diff --git a/generate_data.py b/generate_data.py
index 601c654..7a2ce87 100644
--- a/generate_data.py
+++ b/generate_data.py
@@ -11,7 +11,7 @@
import sys
import numpy as np
import pandas as pd
-from transform_data import ExtractedObject
+import transform_data
# Referenced from geaxgx's playing-card-detection: https://github.com/geaxgx/playing-card-detection
class Backgrounds:
@@ -66,7 +66,7 @@
def apply_bounding_box(img, card_info, display=False):
# List of detected objects to be fed into the neural net
# The first object is the entire card
- detected_object_list = [ExtractedObject('card', [(0, 0), (len(img[0]), 0), (len(img[0]), len(img)), (0, len(img))])]
+ detected_object_list = [transform_data.ExtractedObject('card', [(0, 0), (len(img[0]), 0), (len(img[0]), len(img)), (0, len(img))])]
'''
# Mana symbol - They are located on the top right side of the card, next to the name
# Their position is stationary, and is right-aligned.
@@ -98,7 +98,7 @@
# Append them to the list of bounding box with the appropriate label
symbol_name = 'mana_symbol:' + mana_cost[i]
key_pts = [(x1, y1), (x2, y1), (x2, y2), (x1, y2)]
- detected_object_list.append(ExtractedObject(symbol_name, key_pts))
+ detected_object_list.append(transform_data.ExtractedObject(symbol_name, key_pts))
if display:
img_symbol = img[y1:y2, x1:x2]
@@ -163,7 +163,7 @@
# Append them to the list of bounding box with the appropriate label
symbol_name = 'set_symbol:' + card_info['set']
key_pts = [(x1, y1), (x2, y1), (x2, y2), (x1, y2)]
- detected_object_list.append(ExtractedObject(symbol_name, key_pts))
+ detected_object_list.append(transform_data.ExtractedObject(symbol_name, key_pts))
if display:
img_symbol = img[y1:y2, x1:x2]
diff --git a/setup_train.py b/setup_train.py
index 18c83ee..c7a1235 100644
--- a/setup_train.py
+++ b/setup_train.py
@@ -1,13 +1,13 @@
import os
from glob import glob
import random
-from transform_data import data_dir, darknet_dir
+import transform_data
def main():
random.seed()
data_list = []
- for subdir in glob('%s/train/*' % data_dir):
+ for subdir in glob('%s/train/*' % transform_data.data_dir):
for data in glob(subdir + "/*.jpg"):
data_list.append(os.path.abspath(data))
random.shuffle(data_list)
@@ -15,10 +15,10 @@
test_ratio = 0.1
test_list = data_list[:int(test_ratio * len(data_list))]
train_list = data_list[int(test_ratio * len(data_list)):]
- with open('%s/train.txt' % darknet_dir, 'w') as train_txt:
+ with open('%s/train.txt' % transform_data.darknet_dir, 'w') as train_txt:
for data in train_list:
train_txt.write(data + '\n')
- with open('%s/test.txt' % darknet_dir, 'w') as test_txt:
+ with open('%s/test.txt' % transform_data.darknet_dir, 'w') as test_txt:
for data in test_list:
test_txt.write(data + '\n')
return
diff --git a/transform_data.py b/transform_data.py
index 867abaf..a05bc89 100644
--- a/transform_data.py
+++ b/transform_data.py
@@ -14,7 +14,7 @@
from imgaug import parameters as iap
card_mask = cv2.imread('data/mask.png')
-data_dir = os.path.abspath('/media/edmond/My Passport/data')
+data_dir = os.path.abspath('/media/win10/data')
darknet_dir = os.path.abspath('darknet')
@@ -529,15 +529,15 @@
])
if i % 3 == 0:
generator.generate_non_obstructive()
- generator.export_training_data(visibility=0.0, out_name='%s/train/non_obstructive/%s_%d'
+ generator.export_training_data(visibility=0.0, out_name='%s/train/non_obstructive_skew/%s_%d'
% (data_dir, out_name, j), aug=seq)
elif i % 3 == 1:
generator.generate_horizontal_span(theta=random.uniform(-math.pi, math.pi))
- generator.export_training_data(visibility=0.0, out_name='%s/train/horizontal_span/%s_%d'
+ generator.export_training_data(visibility=0.0, out_name='%s/train/horizontal_span_skew/%s_%d'
% (data_dir, out_name, j), aug=seq)
else:
generator.generate_vertical_span(theta=random.uniform(-math.pi, math.pi))
- generator.export_training_data(visibility=0.0, out_name='%s/train/vertical_span/%s_%d'
+ generator.export_training_data(visibility=0.0, out_name='%s/train/vertical_span_skew/%s_%d'
% (data_dir, out_name, j), aug=seq)
#generator.generate_horizontal_span(theta=random.uniform(-math.pi, math.pi))
#generator.render(display=True, aug=seq, debug=True)
--
Gitblit v1.10.0