ちょいちょい修正

diff --git a/src/main/Python/Data.py b/src/main/Python/Data.py
index 41c7a08..42a680c 100644 (file)
--- a/src/main/Python/Data.py
+++ b/src/main/Python/Data.py
@@ -3,7 +3,7 @@ class Data:
         #想定されるれ連続日数
         #データ(0,0,1xxxxxx)
         dat = []
-
+        label=""
         def getLable(self):
             #TODO
             return self.label

diff --git a/src/main/Python/DataReader.py b/src/main/Python/DataReader.py
index 5cbeb19..deeda76 100644 (file)
--- a/src/main/Python/DataReader.py
+++ b/src/main/Python/DataReader.py
@@ -35,7 +35,7 @@ class DataReader:
             result.setLabel(int(orgdata[0].strip()))
 
             for i in range(1,len(orgdata)):
-                data.append(orgdata[i].split())
+                data.append(orgdata[i].split(','))
             result.setData(data)
 
         return result

diff --git a/src/main/Python/DatasetGenerator.py b/src/main/Python/DatasetGenerator.py
index 10cd551..b861d90 100644 (file)
--- a/src/main/Python/DatasetGenerator.py
+++ b/src/main/Python/DatasetGenerator.py
@@ -12,6 +12,7 @@ class DatasetGenerator:
             labeldata.append(data.getLable())
             graphdata.append(self.createGraphData(data.getData()))
 
+        print(labeldata)
         return tuple_dataset(graphdata,labeldata)
 
     def createGraphData(self,targetData):
@@ -19,10 +20,11 @@ class DatasetGenerator:
         result=[] #type: List[float]
 
         for strline in targetData:
-            data=strline.sprit;
+            print(strline)
+
             floatLine=[] #type: List[float]
 
-            for block in data:
+            for block in strline:
                 floatLine.append(float(block))
             #TODO floatLineの変換処理(データ正規化)を入れておく
             result.extend(floatLine)

diff --git a/src/main/Python/Lern.py b/src/main/Python/Lern.py
index 2e5df25..a43674d 100644 (file)
--- a/src/main/Python/Lern.py
+++ b/src/main/Python/Lern.py
@@ -1,8 +1,13 @@
-from chainer import Link,Chain,ChainList,report,optimizers
+from chainer import Function, gradient_check, report, training, utils, Variable
+from chainer import datasets, iterators, optimizers, serializers
+from chainer import Link, Chain, ChainList
 import chainer.functions as F
 import chainer.links as L
+import math
 from DataReader import DataReader
+from DatasetGenerator import DatasetGenerator
 
+from Data import Data
 
 class MyChain(Chain):
     def __init__(self):
@@ -37,14 +42,40 @@ def main():
         optimizer = optimizers.Adam
         optimizer(model)
 
+        #データ用意
+        train_data = []
+        train_label= []
         #元データ生成
         reader = DataReader() #type DataReader
+        dgene  = DatasetGenerator()#type DataSetGenerator
+
         dataList = []
         dataList = reader.createLearningData()
-        print(len(dataList))
+        dgene.generateDataset(dataList)
+        dust,batchsize=math.modf(len(dataList)/2)
+        batchsize = int(batchsize)
+
+
+
+'''
+        for current in dataList:
+            data = current #type Data
+            if(data.getLable() != ''):
+                alldata = data.getData()#type string
+                for lindata in alldata:
+                    for line in lindata:
+                        for value in line.split(','):
+                            train_data.append(float(value))
+
+                train_label.append(data.getLable())
+
+            print(len(train_label),len(train_data))
+
+        train_iter = iterators.SerialIterator(dataList,batchsize)
+        test_iter  = iterators.SerialIterator(dataList,False,False)
 
 #    except:
 #        print("an error occured")
+'''
 
-main()
-
+main()
\ No newline at end of file