データを正しく読み込まないバグを修正

diff --git a/src/main/Python/DataReader.py b/src/main/Python/DataReader.py
index 4ea7a9a..5cbeb19 100644 (file)
--- a/src/main/Python/DataReader.py
+++ b/src/main/Python/DataReader.py
@@ -5,20 +5,20 @@ import yaml
 class DataReader:
     DATA_SOURCE =""
 
-    def __init(self):
+    def __init__(self):
         with open('config\\toolconf.yml','r') as config:
             confdata = yaml.load(config)
             self.DATA_SOURCE = confdata['dataPath']
 
-    def crateLearningData(self):
+    def createLearningData(self):
         data = []
 
-        for file in self.walkDataDirectory():
+        for file in self.walkDataDirectory(self.DATA_SOURCE):
             data.append(self.read(file))
 
         return data
 
-    def walkDataDirectory(directory):
+    def walkDataDirectory(self,directory):
         for root,dirs,files in os.walk(directory):
             yield root
             for file in files:

diff --git a/src/main/Python/DatasetGenerator.py b/src/main/Python/DatasetGenerator.py
index ca0a8af..10cd551 100644 (file)
--- a/src/main/Python/DatasetGenerator.py
+++ b/src/main/Python/DatasetGenerator.py
@@ -1,7 +1,7 @@
 from chainer.datasets import tuple_dataset
 from Data import Data
 
-class DatsetGenerator:
+class DatasetGenerator:
 
     def generateDataset(self,dataList):
         graphdata = [] #type: List[float]
@@ -27,4 +27,4 @@ class DatsetGenerator:
             #TODO floatLineの変換処理(データ正規化)を入れておく
             result.extend(floatLine)
 
-        return result
\ No newline at end of file
+        return result

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