瀏覽代碼

moved unused functions

Dimitri Korsch 6 年之前
父節點
當前提交
69882c9f8d
共有 1 個文件被更改,包括 22 次插入20 次删除
  1. 22 20
      nabirds/dataset/utils.py

+ 22 - 20
nabirds/dataset/utils.py

@@ -25,26 +25,6 @@ def asarray(im, dtype=np.uint8):
 	else:
 	else:
 		raise ValueError("Unknown image instance ({})!".format(type(im)))
 		raise ValueError("Unknown image instance ({})!".format(type(im)))
 
 
-
-
-def select_crops(crops, mask):
-	selected = np.zeros_like(crops)
-	selected[mask] = crops[mask]
-	return selected
-
-def selection_mask(idxs, n):
-	return np.bincount(idxs, minlength=n).astype(bool)
-
-def random_select(idxs, xy, part_crops, *args, **kw):
-	rnd_idxs = random_idxs(np.arange(len(idxs)), *args, **kw)
-	idxs = idxs[rnd_idxs]
-	xy = xy[:, rnd_idxs]
-
-	mask = selection_mask(idxs, len(part_crops))
-	selected_crops = select_crops(part_crops, mask)
-
-	return idxs, xy, selected_crops
-
 def random_idxs(idxs, rnd=None, n_parts=None):
 def random_idxs(idxs, rnd=None, n_parts=None):
 
 
 	if rnd is None or isinstance(rnd, int):
 	if rnd is None or isinstance(rnd, int):
@@ -65,6 +45,28 @@ def random_idxs(idxs, rnd=None, n_parts=None):
 # def __expand_parts(p):
 # def __expand_parts(p):
 # 	return p[:, 0], p[:, 1:3], p[:, 3].astype(bool)
 # 	return p[:, 0], p[:, 1:3], p[:, 3].astype(bool)
 
 
+def selection_mask(idxs, n):
+	raise DeprecationWarning("Do not use me!")
+	# return np.bincount(idxs, minlength=n).astype(bool)
+
+def select_crops(crops, mask):
+	raise DeprecationWarning("Do not use me!")
+	# selected = np.zeros_like(crops)
+	# selected[mask] = crops[mask]
+	# return selected
+
+def random_select(idxs, xy, part_crops, *args, **kw):
+	raise DeprecationWarning("Do not use me!")
+	# rnd_idxs = random_idxs(np.arange(len(idxs)), *args, **kw)
+	# idxs = idxs[rnd_idxs]
+	# xy = xy[:, rnd_idxs]
+
+	# mask = selection_mask(idxs, len(part_crops))
+	# selected_crops = select_crops(part_crops, mask)
+
+	# return idxs, xy, selected_crops
+
+
 def uniform_parts(im, ratio=DEFAULT_RATIO, round_op=np.floor):
 def uniform_parts(im, ratio=DEFAULT_RATIO, round_op=np.floor):
 	raise DeprecationWarning("Do not use me!")
 	raise DeprecationWarning("Do not use me!")
 	# h, w, c = dimensions(im)
 	# h, w, c = dimensions(im)