データの作成方法を変更

diff --git a/src/main/Python/DatasetGenerator.py b/src/main/Python/DatasetGenerator.py
index b861d90..663b802 100644 (file)
--- a/src/main/Python/DatasetGenerator.py
+++ b/src/main/Python/DatasetGenerator.py
@@ -9,24 +9,24 @@ class DatasetGenerator:
 
         data ="" #type: Data
         for data in dataList:
-            labeldata.append(data.getLable())
-            graphdata.append(self.createGraphData(data.getData()))
+            temgraphdata = self.createGraphData(data.getData());
+            #TODO データサイズがマジックナンバーはやばい。
+            if(data.getLable() != '' and len(temgraphdata)==10):
+                labeldata.append(data.getLable())
+                graphdata.append(temgraphdata)
 
-        print(labeldata)
-        return tuple_dataset(graphdata,labeldata)
+        return graphdata,labeldata
 
     def createGraphData(self,targetData):
 
         result=[] #type: List[float]
 
         for strline in targetData:
-            print(strline)
-
             floatLine=[] #type: List[float]
 
             for block in strline:
                 floatLine.append(float(block))
             #TODO floatLineの変換処理(データ正規化)を入れておく
-            result.extend(floatLine)
+            result.append(floatLine)
 
         return result

diff --git a/src/main/Python/Lern.py b/src/main/Python/Lern.py
index a43674d..90be065 100644 (file)
--- a/src/main/Python/Lern.py
+++ b/src/main/Python/Lern.py
@@ -51,12 +51,11 @@ def main():
 
         dataList = []
         dataList = reader.createLearningData()
-        dgene.generateDataset(dataList)
+        train_data,train_label = dgene.generateDataset(dataList)
         dust,batchsize=math.modf(len(dataList)/2)
         batchsize = int(batchsize)
 
 
-
 '''
         for current in dataList:
             data = current #type Data