diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e693b86..42c1a53 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="0aedafd8-e57e-462a-beda-65af0b91f3df" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/serve.py" beforeDir="false" afterPath="$PROJECT_DIR$/serve.py" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -48,7 +48,7 @@
         <counts>
           <entry key="Dockerfile" value="81" />
           <entry key="md" value="104" />
-          <entry key="py" value="2428" />
+          <entry key="py" value="2434" />
           <entry key="sh" value="5" />
         </counts>
       </usages-collector>
@@ -57,7 +57,7 @@
           <entry key="Bash" value="5" />
           <entry key="Dockerfile" value="81" />
           <entry key="Markdown" value="104" />
-          <entry key="Python" value="2428" />
+          <entry key="Python" value="2434" />
         </counts>
       </usages-collector>
     </session>
@@ -76,14 +76,14 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/serve.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="314">
-              <caret line="131" column="36" selection-start-line="131" selection-start-column="36" selection-end-line="131" selection-end-column="36" />
+            <state relative-caret-position="387">
+              <caret line="186" column="30" selection-start-line="186" selection-start-column="30" selection-end-line="186" selection-end-column="30" />
               <folding>
                 <element signature="e#18#46#0" expanded="true" />
-                <marker date="1588356094829" expanded="true" signature="5611:5613" ph="..." />
+                <marker date="1588357497851" expanded="true" signature="5576:5578" ph="..." />
               </folding>
             </state>
           </provider>
@@ -92,8 +92,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/train.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1320">
-              <caret line="88" column="33" lean-forward="true" selection-start-line="88" selection-start-column="33" selection-end-line="88" selection-end-column="33" />
+            <state relative-caret-position="178">
+              <caret line="67" column="49" selection-start-line="67" selection-start-column="42" selection-end-line="67" selection-end-column="49" />
               <folding>
                 <element signature="e#0#28#0" expanded="true" />
               </folding>
@@ -113,7 +113,7 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Dockerfile">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="180">
@@ -134,8 +134,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/model_tensorflow.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="55">
-              <caret line="5" column="29" selection-start-line="5" selection-start-column="29" selection-end-line="5" selection-end-column="29" />
+            <state relative-caret-position="297">
+              <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
               <folding>
                 <element signature="e#0#23#0" expanded="true" />
               </folding>
@@ -179,9 +179,9 @@
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/model_tensorflow.py" />
-        <option value="$PROJECT_DIR$/serve.py" />
-        <option value="$PROJECT_DIR$/train.py" />
         <option value="$PROJECT_DIR$/Dockerfile" />
+        <option value="$PROJECT_DIR$/train.py" />
+        <option value="$PROJECT_DIR$/serve.py" />
       </list>
     </option>
   </component>
@@ -224,7 +224,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588357220201" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588357393746" />
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -265,12 +265,12 @@
       <option name="presentableId" value="Default" />
       <updated>1588152877746</updated>
       <workItem from="1588152880522" duration="16973000" />
-      <workItem from="1588319878551" duration="16300000" />
+      <workItem from="1588319878551" duration="16609000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33273000" />
+    <option name="totallyTimeSpent" value="33582000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
@@ -339,16 +339,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="105">
-            <caret line="7" column="6" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/data/stock_data.csv">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
@@ -366,10 +356,37 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Dockerfile">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="58" selection-start-line="12" selection-start-column="58" selection-end-line="12" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/train.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="67" column="49" selection-start-line="67" selection-start-column="42" selection-end-line="67" selection-end-column="49" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="105">
+            <caret line="7" column="6" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/model_tensorflow.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="55">
-          <caret line="5" column="29" selection-start-line="5" selection-start-column="29" selection-end-line="5" selection-end-column="29" />
+        <state relative-caret-position="297">
+          <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
           <folding>
             <element signature="e#0#23#0" expanded="true" />
           </folding>
@@ -378,32 +395,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/serve.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="314">
-          <caret line="131" column="36" selection-start-line="131" selection-start-column="36" selection-end-line="131" selection-end-column="36" />
+        <state relative-caret-position="387">
+          <caret line="186" column="30" selection-start-line="186" selection-start-column="30" selection-end-line="186" selection-end-column="30" />
           <folding>
             <element signature="e#18#46#0" expanded="true" />
-            <marker date="1588356094829" expanded="true" signature="5611:5613" ph="..." />
+            <marker date="1588357497851" expanded="true" signature="5576:5578" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/train.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1320">
-          <caret line="88" column="33" lean-forward="true" selection-start-line="88" selection-start-column="33" selection-end-line="88" selection-end-column="33" />
-          <folding>
-            <element signature="e#0#28#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Dockerfile">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="58" selection-start-line="12" selection-start-column="58" selection-end-line="12" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/serve.py b/serve.py
index 315a241..3a50801 100644
--- a/serve.py
+++ b/serve.py
@@ -21,7 +21,7 @@ class Config:
 
 	predict_day = 1
 
-	input_size = len(feature_columns) - 1
+	input_size = len(feature_columns)
 	output_size = len(label_columns)
 
 	hidden_size = 128
@@ -35,7 +35,7 @@ class Config:
 	shuffle_train_data = True
 
 	# train_data_rate = 0.95 #comment yqy
-	train_data_rate = 0.95  # add yqy
+	train_data_rate = 1  # add yqy
 	valid_data_rate = 0.15
 
 	batch_size = 64
@@ -115,8 +115,8 @@ class Data:
 		time_step_size = feature_data.shape[0] // self.config.time_step
 
 		test_x = [feature_data[self.start_num_in_test + i * self.config.time_step: self.start_num_in_test + (
-				i + 1) * self.config.time_step] for i in range(time_step_size)]
-
+				i + 1) * self.config.time_step]
+		          for i in range(time_step_size)]
 		if return_label_data:
 			label_data = self.norm_data[self.train_num + self.start_num_in_test:, self.config.label_in_feature_columns]
 			return np.array(test_x), label_data
@@ -128,9 +128,7 @@ class Data:
 			test_data_yqy = []
 		# test_data_yqy=test_data_yqy[1:21]
 		feature_data = (test_data_yqy - self.mean) / self.std
-		print(feature_data[:, :1])
-		test_x = [feature_data[:, :1]]
-		print(feature_data)
+		test_x = [feature_data]
 		return np.array(test_x)
 
 
@@ -142,6 +140,7 @@ def draw_yqy(config2, origin_data, predict_norm_data, mean_yqy, std_yqy):
 	assert label_norm_data.shape[0] == predict_norm_data.shape[
 		0], "The element number in origin and predicted data is different"
 
+	print("dsa")
 	# label_norm_data=label_norm_data[:,1]
 	label_name = 'high'
 	label_column_num = 3
@@ -153,14 +152,16 @@ def draw_yqy(config2, origin_data, predict_norm_data, mean_yqy, std_yqy):
 	# label_X = range(origin_data.data_num - origin_data.train_num - origin_data.start_num_in_test)
 	# predict_X = [x + config.predict_day for x in label_X]
 
-	# print(label_norm_data[:, 1:2])
-	label_data = label_norm_data[:, 1:2] * std_yqy[1:2] + mean_yqy[1:2]
-	# print(label_data)
+	print("2")
 
-	# print(predict_norm_data)
+	print(label_norm_data[:, 1:2])
+	label_data = label_norm_data[:, 1:2] * std_yqy[1:2] + mean_yqy[1:2]
+	print(label_data)
+
+	print(predict_norm_data)
 	predict_data = predict_norm_data * std_yqy[config.label_in_feature_columns] + mean_yqy[
 		config.label_in_feature_columns]
-	# print(predict_data)
+	print(predict_data)
 
 	print(label_data[:, -1])
 	print(predict_data[:, -1])
@@ -178,13 +179,14 @@ def train_models():
 
 	train_X, valid_X, train_Y, valid_Y = data_gainer.get_train_and_valid_data()
 
+	print(train_X, valid_X, train_Y, valid_Y)
+	print(train_X.shape[0])
 	if train_X.shape[0] < 500:
 		config.batch_size = 32
 	if train_X.shape[0] < 200:
 		config.batch_size = 16
 
-	print(train_X[:, :, :1], valid_X[:, :, :1], train_Y, valid_Y)
-	train(config, train_X[:, :, :1], train_Y, valid_X[:, :, :1], valid_Y)
+	train(config, train_X, train_Y, valid_X, valid_Y)
 
 	lock.release()
 
@@ -328,7 +330,7 @@ if __name__ == '__main__':
 				csvfile, delimiter=',',
 				quotechar='|', quoting=csv.QUOTE_MINIMAL
 			)
-			# spamwriter.writerow(["job", "model", "time", "utilGPU", "utilCPU", "pre", "main", "post"])
+			#spamwriter.writerow(["job", "model", "time", "utilGPU", "utilCPU", "pre", "main", "post"])
 			spamwriter.writerow(["seq", "value"])
 
 		# Wait forever for incoming http requests