データから不正な改行コードを削除。ファイルウォーカーからディレクトリも返却されるバグを修正

diff --git a/src/main/Python/DataReader.py b/src/main/Python/DataReader.py
index deeda76..6818e6a 100644 (file)
--- a/src/main/Python/DataReader.py
+++ b/src/main/Python/DataReader.py
@@ -18,15 +18,16 @@ class DataReader:
 
         return data
 
+    #FIXME このメソッド間違えてる
     def walkDataDirectory(self,directory):
         for root,dirs,files in os.walk(directory):
-            yield root
+
             for file in files:
                 yield os.path.join(root,file)
 
     def read(self,file):
         result = Data.Data()
-        if(os.path.isfile(file)):
+        if os.path.isfile(file):
             datafile = open(file)
             orgdata = datafile.readlines()
             data = []
@@ -35,7 +36,8 @@ class DataReader:
             result.setLabel(int(orgdata[0].strip()))
 
             for i in range(1,len(orgdata)):
-                data.append(orgdata[i].split(','))
+                line_data = orgdata[i].replace("\n","")
+                data.append(line_data.split(','))
             result.setData(data)
 
-        return result
+        return result
\ No newline at end of file

diff --git a/src/test/Python/config/toolconf.yml b/src/test/Python/config/toolconf.yml
new file mode 100644 (file)
index 0000000..cc2f3b3
--- /dev/null
+++ b/src/test/Python/config/toolconf.yml
@@ -0,0 +1 @@
+dataPath: ..\resources\data

diff --git a/src/test/resources/data/2007/USDJPY_1D_10B_2007_0003.txt b/src/test/resources/data/2007/USDJPY_1D_10B_2007_0003.txt
new file mode 100644 (file)
index 0000000..23f88e3
--- /dev/null
+++ b/src/test/resources/data/2007/USDJPY_1D_10B_2007_0003.txt
@@ -0,0 +1 @@
+3\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\r0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\r0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\r1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\r
\ No newline at end of file

diff --git a/src/test/resources/data/2007/USDJPY_1D_10B_2007_0004.txt b/src/test/resources/data/2007/USDJPY_1D_10B_2007_0004.txt
new file mode 100644 (file)
index 0000000..c2623e4
--- /dev/null
+++ b/src/test/resources/data/2007/USDJPY_1D_10B_2007_0004.txt
@@ -0,0 +1 @@
+4\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0\r0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\r0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\r0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\r
\ No newline at end of file