データセット生成機能を追加

(未テスト)

diff --git a/src/main/Python/DataReader.py b/src/main/Python/DataReader.py
index 427fa59..4ea7a9a 100644 (file)
--- a/src/main/Python/DataReader.py
+++ b/src/main/Python/DataReader.py
@@ -1,8 +1,28 @@
 import os
 import Data
-
+import yaml
 
 class DataReader:
+    DATA_SOURCE =""
+
+    def __init(self):
+        with open('config\\toolconf.yml','r') as config:
+            confdata = yaml.load(config)
+            self.DATA_SOURCE = confdata['dataPath']
+
+    def crateLearningData(self):
+        data = []
+
+        for file in self.walkDataDirectory():
+            data.append(self.read(file))
+
+        return data
+
+    def walkDataDirectory(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()

diff --git a/src/main/Python/DatasetGenerator.py b/src/main/Python/DatasetGenerator.py
index 47270ea..ca0a8af 100644 (file)
--- a/src/main/Python/DatasetGenerator.py
+++ b/src/main/Python/DatasetGenerator.py
@@ -1,2 +1,30 @@
 from chainer.datasets import tuple_dataset
+from Data import Data
 
+class DatsetGenerator:
+
+    def generateDataset(self,dataList):
+        graphdata = [] #type: List[float]
+        labeldata = [] #type: List[float]
+
+        data ="" #type: Data
+        for data in dataList:
+            labeldata.append(data.getLable())
+            graphdata.append(self.createGraphData(data.getData()))
+
+        return tuple_dataset(graphdata,labeldata)
+
+    def createGraphData(self,targetData):
+
+        result=[] #type: List[float]
+
+        for strline in targetData:
+            data=strline.sprit;
+            floatLine=[] #type: List[float]
+
+            for block in data:
+                floatLine.append(float(block))
+            #TODO floatLineの変換処理(データ正規化)を入れておく
+            result.extend(floatLine)
+
+        return result
\ No newline at end of file