From 51cac2874c55bdf81519b7e651eeb1f2573ee66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Bonnin?= <mickael.bonnin@univ-nantes.fr>
Date: Thu, 15 Sep 2022 09:25:18 +0200
Subject: [PATCH] Use 'spectro_extract' instead of 'valid' & 'pred'.
---
run.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/run.py b/run.py
index fa38307..c382357 100644
--- a/run.py
+++ b/run.py
@@ -6,7 +6,7 @@ import argparse
import numpy as np
from prediction import pred, valid
-from data_process import spectro_extract_pred, spectro_extract_valid
+from data_process import spectro_extract
def read_args() -> argparse.Namespace:
@@ -48,16 +48,16 @@ def read_args() -> argparse.Namespace:
def main(args: argparse.Namespace):
if args.mode == 'pred':
- data = spectro_extract_pred(
- data_dir=args.data_dir, spectro_dir=args.spectro_dir)
+ data = spectro_extract(data_dir=args.data_dir,
+ spectro_dir=args.spectro_dir)
pred(model_dir=args.model_dir, spectro_dir=args.spectro_dir,
output_dir=args.output_dir)
if args.mode == 'valid':
events = np.genfromtxt(
f'{args.csv_dir}', delimiter=',', skip_header=1, dtype=str)
- data = spectro_extract_valid(
- data_dir=args.data_dir, spectro_dir=args.spectro_dir, events_list=events)
+ data = spectro_extract(data_dir=args.data_dir,
+ spectro_dir=args.spectro_dir, events_list=events)
valid(model_dir=args.model_dir, spectro_dir='./spectro_demo',
output_dir=args.output_dir, event_label=events)
--
GitLab