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

---
 .idea/workspace.xml | 52 ++++++++++++++++++++++-----------------------
 serve.py            | 16 +++-----------
 2 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c5105eb..46ffb18 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <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" />
-    </list>
+    <list default="true" id="0aedafd8-e57e-462a-beda-65af0b91f3df" name="Default Changelist" comment="" />
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -50,7 +48,7 @@
           <entry key="csv" value="9" />
           <entry key="gitignore" value="12" />
           <entry key="md" value="141" />
-          <entry key="py" value="4313" />
+          <entry key="py" value="4322" />
           <entry key="sh" value="5" />
         </counts>
       </usages-collector>
@@ -60,7 +58,7 @@
           <entry key="Dockerfile" value="81" />
           <entry key="Markdown" value="141" />
           <entry key="PLAIN_TEXT" value="21" />
-          <entry key="Python" value="4313" />
+          <entry key="Python" value="4322" />
         </counts>
       </usages-collector>
     </session>
@@ -70,8 +68,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/main.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3315">
-              <caret line="221" column="26" lean-forward="true" selection-start-line="221" selection-start-column="26" selection-end-line="221" selection-end-column="26" />
+            <state relative-caret-position="90">
+              <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
               <folding>
                 <element signature="e#0#19#0" expanded="true" />
               </folding>
@@ -91,13 +89,13 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/serve.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1203">
-              <caret line="137" column="39" selection-start-line="137" selection-start-column="39" selection-end-line="137" selection-end-column="39" />
+            <state relative-caret-position="110">
+              <caret line="137" lean-forward="true" selection-start-line="137" selection-end-line="137" />
               <folding>
                 <element signature="e#18#46#0" expanded="true" />
-                <marker date="1588416891694" expanded="true" signature="1234:1237" ph="..." />
-                <marker date="1588416891694" expanded="true" signature="3508:3510" ph="..." />
-                <marker date="1588416891694" expanded="true" signature="4628:5345" ph="..." />
+                <marker date="1588417620511" expanded="true" signature="1271:1274" ph="..." />
+                <marker date="1588417620511" expanded="true" signature="3614:3616" ph="..." />
+                <marker date="1588417620511" expanded="true" signature="4821:5523" ph="..." />
               </folding>
             </state>
           </provider>
@@ -106,8 +104,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/train.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="127">
-              <caret line="40" column="10" selection-start-line="40" selection-start-column="4" selection-end-line="40" selection-end-column="10" />
+            <state relative-caret-position="195">
+              <caret line="64" column="22" selection-start-line="64" selection-start-column="12" selection-end-line="64" selection-end-column="22" />
               <folding>
                 <element signature="e#0#28#0" expanded="true" />
               </folding>
@@ -185,8 +183,8 @@
         <option value="$PROJECT_DIR$/data/data2.csv" />
         <option value="$PROJECT_DIR$/data/data3.csv" />
         <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/serve.py" />
         <option value="$PROJECT_DIR$/train.py" />
+        <option value="$PROJECT_DIR$/serve.py" />
       </list>
     </option>
   </component>
@@ -229,7 +227,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="1588417375963" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588419833416" />
     <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" />
@@ -270,12 +268,12 @@
       <option name="presentableId" value="Default" />
       <updated>1588152877746</updated>
       <workItem from="1588152880522" duration="16973000" />
-      <workItem from="1588319878551" duration="38759000" />
+      <workItem from="1588319878551" duration="39897000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="55732000" />
+    <option name="totallyTimeSpent" value="56870000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
@@ -401,21 +399,21 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/serve.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1203">
-          <caret line="137" column="39" selection-start-line="137" selection-start-column="39" selection-end-line="137" selection-end-column="39" />
+        <state relative-caret-position="110">
+          <caret line="137" lean-forward="true" selection-start-line="137" selection-end-line="137" />
           <folding>
             <element signature="e#18#46#0" expanded="true" />
-            <marker date="1588416891694" expanded="true" signature="1234:1237" ph="..." />
-            <marker date="1588416891694" expanded="true" signature="3508:3510" ph="..." />
-            <marker date="1588416891694" expanded="true" signature="4628:5345" ph="..." />
+            <marker date="1588417620511" expanded="true" signature="1271:1274" ph="..." />
+            <marker date="1588417620511" expanded="true" signature="3614:3616" ph="..." />
+            <marker date="1588417620511" expanded="true" signature="4821:5523" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3315">
-          <caret line="221" column="26" lean-forward="true" selection-start-line="221" selection-start-column="26" selection-end-line="221" selection-end-column="26" />
+        <state relative-caret-position="90">
+          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
           <folding>
             <element signature="e#0#19#0" expanded="true" />
           </folding>
@@ -424,8 +422,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/train.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="127">
-          <caret line="40" column="10" selection-start-line="40" selection-start-column="4" selection-end-line="40" selection-end-column="10" />
+        <state relative-caret-position="195">
+          <caret line="64" column="22" selection-start-line="64" selection-start-column="12" selection-end-line="64" selection-end-column="22" />
           <folding>
             <element signature="e#0#28#0" expanded="true" />
           </folding>
diff --git a/serve.py b/serve.py
index 42a6336..94ac1b9 100644
--- a/serve.py
+++ b/serve.py
@@ -97,11 +97,7 @@ def train_models(job):
 	# transform data to be supervised learning
 	lag = 4
 	supervised = timeseries_to_supervised(diff_values, lag)
-	print(supervised)
-	print(type(supervised))
-	print(supervised.shape)
 	supervised_values = supervised.values
-	print(supervised_values)
 
 	batch_size = 32
 	if supervised_values.shape[0] < 100:
@@ -161,21 +157,13 @@ def predict(job, seq):
 
 	# transform data to be stationary
 	raw_values = df.values
-	print(raw_values)
 	diff_values = difference(raw_values, 1)
-	print(diff_values)
 
 	# transform data to be supervised learning
 	lag = 4
 	supervised = timeseries_to_supervised(diff_values, lag)
-	print(type(supervised))
-	print(supervised)
 	supervised_values = supervised[-batch_size:]
-	print(type(supervised_values))
-	print(supervised_values)
-	print(supervised_values.shape)
 	test = supervised_values.values
-	print(test)
 
 	test = test.reshape(test.shape[0], test.shape[1])
 	test_scaled = scaler.transform(test)
@@ -198,7 +186,7 @@ def predict(job, seq):
 
 	rmse = sqrt(mean_squared_error(raw_values[-batch_size:], predictions))
 	print(predictions, raw_values[-batch_size:])
-	return 1, True
+	return predictions[-1], True
 
 
 class MyHandler(BaseHTTPRequestHandler):
@@ -223,6 +211,8 @@ class MyHandler(BaseHTTPRequestHandler):
 
 				if not success:
 					msg = {'code': 2, 'error': "Job " + job + " not exist"}
+				else:
+					msg = {'code': 2, 'error': "", "total": pred}
 			except Exception as e:
 				track = traceback.format_exc()
 				print(track)