numpyデータ作成するためのメソッドを追加

diff --git a/src/main/Python/Data.py b/src/main/Python/Data.py
index 42a680c..aa4249c 100644 (file)
--- a/src/main/Python/Data.py
+++ b/src/main/Python/Data.py
@@ -1,3 +1,6 @@
+from typing import List, Any
+
+import numpy
 
 class Data:
         #想定されるれ連続日数
@@ -16,3 +19,9 @@ class Data:
 
         def setData(self,value):
             self.dat = value
+
+        def get_array_data(self):
+            result: List[Any] = []
+            for data in self.dat:
+                result.append(numpy.array(data, dtype=numpy.float32))
+            return numpy.array(result)

diff --git a/src/test/Python/TestData.py b/src/test/Python/TestData.py
new file mode 100644 (file)
index 0000000..0898f0b
--- /dev/null
+++ b/src/test/Python/TestData.py
@@ -0,0 +1,19 @@
+import unittest
+from Data import Data
+from DataReader import DataReader
+import os
+
+PATH = "..\\resources\\data\\2007\\USDJPY_1D_10B_2007_0001.txt"
+
+
+class TestData(unittest.TestCase):
+    target_data = Data()
+
+    @classmethod
+    def setUpClass(cls):
+        cls.target_data = DataReader().read(os.path.abspath(PATH))
+
+    def test_get_array_data(self):
+        assert str(type(self.target_data.get_array_data())) == '<class \'numpy.ndarray\'>', str(type(self.target_data.get_array_data()))+"は想定している型と異なります"
+        assert len(self.target_data.get_array_data()) == 10
+        assert str(type(self.target_data.get_array_data()[0][0])) == '<class \'numpy.float32\'>'

diff --git a/src/test/Python/TestDataReader.py b/src/test/Python/TestDataReader.py
index aabad4a..434a801 100644 (file)
--- a/src/test/Python/TestDataReader.py
+++ b/src/test/Python/TestDataReader.py
@@ -2,14 +2,18 @@ import unittest
 import DataReader
 import os
 
+PATH = "..\\resources\\data\\2007\\USDJPY_1D_10B_2007_0001.txt"
+
+
 class TestDataReader(unittest.TestCase):
+
     def testReadData1(self):
         print("データ読み込みパス："+os.path.dirname(os.path.abspath(__file__)))
-        print("データファイル:"+os.path.abspath("..\\resources\\data\\2007\\USDJPY_1D_10B_2007_0001.txt"))
+        print("データファイル:" + os.path.abspath(PATH))
         data_reader = DataReader.DataReader()
-        res = data_reader.read(os.path.abspath("..\\resources\\data\\2007\\USDJPY_1D_10B_2007_0001.txt"))
-        assert len(res.getData()) == 10,"データサイズが不正です"
-        assert res.getLable() == 3 ,res.getLable() + "は期待通りの値ではありません。"
+        res = data_reader.read(os.path.abspath("%s" % PATH))
+        assert len(res.getData()) == 10, "データサイズが不正です"
+        assert res.getLable() == 3, res.getLable() + "は期待通りの値ではありません。"
 
     def test_walk_data_directory(self):
         data_reader = DataReader.DataReader()
@@ -23,5 +27,6 @@ class TestDataReader(unittest.TestCase):
         assert len(result) == 3, str(len(result))+"データ個数が不正です"
         assert result[0].getLable() == 3
 
-if __name__=="__main__":
-    unittest.main()
\ No newline at end of file
+    
+if __name__ == "__main__":
+    unittest.main()