From d305fd31f37b974d92d5c5c8d35e045edbe33a03 Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Sat, 2 May 2020 17:31:33 +0800
Subject: [PATCH] update

---
 .idea/workspace.xml | 31 +++++++++++++++----------------
 serve.py            | 10 ++++++----
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a015171..c4c42ce 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0aedafd8-e57e-462a-beda-65af0b91f3df" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/serve.py" beforeDir="false" afterPath="$PROJECT_DIR$/serve.py" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -51,7 +50,7 @@
           <entry key="csv" value="9" />
           <entry key="gitignore" value="12" />
           <entry key="md" value="141" />
-          <entry key="py" value="3812" />
+          <entry key="py" value="3903" />
           <entry key="sh" value="5" />
         </counts>
       </usages-collector>
@@ -61,7 +60,7 @@
           <entry key="Dockerfile" value="81" />
           <entry key="Markdown" value="141" />
           <entry key="PLAIN_TEXT" value="21" />
-          <entry key="Python" value="3812" />
+          <entry key="Python" value="3903" />
         </counts>
       </usages-collector>
     </session>
@@ -92,13 +91,13 @@
       <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="275">
-              <caret line="124" selection-start-line="124" selection-end-line="124" />
+            <state relative-caret-position="136">
+              <caret line="157" column="39" selection-start-line="157" selection-start-column="39" selection-end-line="157" selection-end-column="39" />
               <folding>
                 <element signature="e#18#46#0" expanded="true" />
-                <marker date="1588411495460" expanded="true" signature="1167:1170" ph="..." />
-                <marker date="1588411495460" expanded="true" signature="3335:3337" ph="..." />
-                <marker date="1588411495460" expanded="true" signature="4048:4780" ph="..." />
+                <marker date="1588411772748" expanded="true" signature="1167:1170" ph="..." />
+                <marker date="1588411772748" expanded="true" signature="3335:3337" ph="..." />
+                <marker date="1588411772748" expanded="true" signature="4043:4775" ph="..." />
               </folding>
             </state>
           </provider>
@@ -248,7 +247,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="1588411617480" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588411820165" />
     <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" />
@@ -289,12 +288,12 @@
       <option name="presentableId" value="Default" />
       <updated>1588152877746</updated>
       <workItem from="1588152880522" duration="16973000" />
-      <workItem from="1588319878551" duration="34253000" />
+      <workItem from="1588319878551" duration="34530000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="51226000" />
+    <option name="totallyTimeSpent" value="51503000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
@@ -439,13 +438,13 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/serve.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="124" selection-start-line="124" selection-end-line="124" />
+        <state relative-caret-position="136">
+          <caret line="157" column="39" selection-start-line="157" selection-start-column="39" selection-end-line="157" selection-end-column="39" />
           <folding>
             <element signature="e#18#46#0" expanded="true" />
-            <marker date="1588411495460" expanded="true" signature="1167:1170" ph="..." />
-            <marker date="1588411495460" expanded="true" signature="3335:3337" ph="..." />
-            <marker date="1588411495460" expanded="true" signature="4048:4780" ph="..." />
+            <marker date="1588411772748" expanded="true" signature="1167:1170" ph="..." />
+            <marker date="1588411772748" expanded="true" signature="3335:3337" ph="..." />
+            <marker date="1588411772748" expanded="true" signature="4043:4775" ph="..." />
           </folding>
         </state>
       </provider>
diff --git a/serve.py b/serve.py
index b4e9d4f..f9dfa7c 100644
--- a/serve.py
+++ b/serve.py
@@ -136,14 +136,15 @@ def predict(job, seq):
 		'value': 0,
 	}
 
-	df = pd.read_csv('./data/' + job + '.csv', usecols=['seq', 'value'])
-	df = df.tail(int(models[job]['batch_size']) * 2 - 1)
-	df = df.append(data, ignore_index=True)
-
 	batch_size = int(models[job]['batch_size'])
 
+	df = pd.read_csv('./data/' + job + '.csv', usecols=['seq', 'value'])
+	df = df.tail(batch_size * 2 - 1)
+	df = df.append(data, ignore_index=True)
+
 	# transform data to be stationary
 	raw_values = df.values
+	print(raw_values)
 	diff_values = difference(raw_values, 1)[batch_size:]
 	# transform data to be supervised learning
 	lag = 4
@@ -151,6 +152,7 @@ def predict(job, seq):
 	supervised_values = supervised.values
 
 	test = supervised_values
+	print(test)
 
 	test = test.reshape(test.shape[0], test.shape[1])
 	test_scaled = models[job]['scaler'].transform(test)