From 9e9e3b092c533b00067be7d6dcfeef1f9201a7cb Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Fri, 1 May 2020 19:11:31 +0800
Subject: [PATCH] update

---
 .idea/workspace.xml | 35 +++++++++++++++++++----------------
 serve.py            |  8 +++++---
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 58bfcfd..9a0300d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,10 @@
 <?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="" />
+    <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$/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" />
     <option name="SHOW_DIALOG" value="false" />
@@ -45,7 +48,7 @@
         <counts>
           <entry key="Dockerfile" value="75" />
           <entry key="md" value="104" />
-          <entry key="py" value="2047" />
+          <entry key="py" value="2064" />
           <entry key="sh" value="5" />
         </counts>
       </usages-collector>
@@ -54,7 +57,7 @@
           <entry key="Bash" value="5" />
           <entry key="Dockerfile" value="75" />
           <entry key="Markdown" value="104" />
-          <entry key="Python" value="2047" />
+          <entry key="Python" value="2064" />
         </counts>
       </usages-collector>
     </session>
@@ -64,8 +67,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="167">
-              <caret line="151" column="46" selection-start-line="151" selection-start-column="35" selection-end-line="151" selection-end-column="46" />
+            <state relative-caret-position="276">
+              <caret line="151" column="82" selection-start-line="151" selection-start-column="51" selection-end-line="151" selection-end-column="82" />
               <folding>
                 <element signature="e#0#19#0" expanded="true" />
               </folding>
@@ -76,11 +79,11 @@
       <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="261">
-              <caret line="161" column="49" selection-start-line="161" selection-start-column="49" selection-end-line="161" selection-end-column="49" />
+            <state relative-caret-position="328">
+              <caret line="167" column="27" lean-forward="true" selection-start-line="167" selection-start-column="27" selection-end-line="167" selection-end-column="27" />
               <folding>
                 <element signature="e#18#46#0" expanded="true" />
-                <marker date="1588330724423" expanded="true" signature="5509:5511" ph="..." />
+                <marker date="1588331240153" expanded="true" signature="5604:5606" ph="..." />
               </folding>
             </state>
           </provider>
@@ -203,7 +206,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="1588330872502" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588331456031" />
     <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" />
@@ -244,12 +247,12 @@
       <option name="presentableId" value="Default" />
       <updated>1588152877746</updated>
       <workItem from="1588152880522" duration="16973000" />
-      <workItem from="1588319878551" duration="9593000" />
+      <workItem from="1588319878551" duration="9940000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="26566000" />
+    <option name="totallyTimeSpent" value="26913000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
@@ -354,8 +357,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="167">
-          <caret line="151" column="46" selection-start-line="151" selection-start-column="35" selection-end-line="151" selection-end-column="46" />
+        <state relative-caret-position="276">
+          <caret line="151" column="82" selection-start-line="151" selection-start-column="51" selection-end-line="151" selection-end-column="82" />
           <folding>
             <element signature="e#0#19#0" expanded="true" />
           </folding>
@@ -364,11 +367,11 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/serve.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="161" column="49" selection-start-line="161" selection-start-column="49" selection-end-line="161" selection-end-column="49" />
+        <state relative-caret-position="328">
+          <caret line="167" column="27" lean-forward="true" selection-start-line="167" selection-start-column="27" selection-end-line="167" selection-end-column="27" />
           <folding>
             <element signature="e#18#46#0" expanded="true" />
-            <marker date="1588330724423" expanded="true" signature="5509:5511" ph="..." />
+            <marker date="1588331240153" expanded="true" signature="5604:5606" ph="..." />
           </folding>
         </state>
       </provider>
diff --git a/serve.py b/serve.py
index 84f3c89..77d117f 100644
--- a/serve.py
+++ b/serve.py
@@ -156,15 +156,17 @@ def draw_yqy(config2, origin_data, predict_norm_data, mean_yqy, std_yqy):
 
 	print("2")
 
+	print(label_norm_data[:,5:8])
 	label_data = label_norm_data[:, 5:8] * std_yqy[5:8] + mean_yqy[5:8]
 	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]
+	predict_data = predict_norm_data * std_yqy[config.label_in_feature_columns] + mean_yqy[
+		config.label_in_feature_columns]
 	print(predict_data)
 
-	print(label_data[-1])
-	print(predict_data[-1])
+	print(label_data[:, -1])
+	print(predict_data[:, -1])
 
 
 PORT_NUMBER = 8080