From e5911eab1ed8d5ea5fc46a93b36b2d1e1ac798aa Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Fri, 1 May 2020 18:57:06 +0800
Subject: [PATCH] update

---
 .idea/workspace.xml | 22 ++++++++++++----------
 serve.py            |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e8847a6..473abd1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,9 @@
 <?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$/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 +47,7 @@
         <counts>
           <entry key="Dockerfile" value="75" />
           <entry key="md" value="104" />
-          <entry key="py" value="2003" />
+          <entry key="py" value="2012" />
           <entry key="sh" value="5" />
         </counts>
       </usages-collector>
@@ -54,7 +56,7 @@
           <entry key="Bash" value="5" />
           <entry key="Dockerfile" value="75" />
           <entry key="Markdown" value="104" />
-          <entry key="Python" value="2003" />
+          <entry key="Python" value="2012" />
         </counts>
       </usages-collector>
     </session>
@@ -77,10 +79,10 @@
         <entry file="file://$PROJECT_DIR$/serve.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="153">
-              <caret line="151" column="23" lean-forward="true" selection-start-line="151" selection-start-column="23" selection-end-line="151" selection-end-column="23" />
+              <caret line="150" column="54" selection-start-line="150" selection-start-column="54" selection-end-line="150" selection-end-column="54" />
               <folding>
                 <element signature="e#18#46#0" expanded="true" />
-                <marker date="1588330059782" expanded="true" signature="5533:5535" ph="..." />
+                <marker date="1588330405823" expanded="true" signature="5504:5506" ph="..." />
               </folding>
             </state>
           </provider>
@@ -203,7 +205,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="1588330361419" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588330577312" />
     <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 +246,12 @@
       <option name="presentableId" value="Default" />
       <updated>1588152877746</updated>
       <workItem from="1588152880522" duration="16973000" />
-      <workItem from="1588319878551" duration="8840000" />
+      <workItem from="1588319878551" duration="9084000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="25813000" />
+    <option name="totallyTimeSpent" value="26057000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
@@ -364,10 +366,10 @@
     <entry file="file://$PROJECT_DIR$/serve.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="153">
-          <caret line="151" column="23" lean-forward="true" selection-start-line="151" selection-start-column="23" selection-end-line="151" selection-end-column="23" />
+          <caret line="150" column="54" selection-start-line="150" selection-start-column="54" selection-end-line="150" selection-end-column="54" />
           <folding>
             <element signature="e#18#46#0" expanded="true" />
-            <marker date="1588330059782" expanded="true" signature="5533:5535" ph="..." />
+            <marker date="1588330405823" expanded="true" signature="5504:5506" ph="..." />
           </folding>
         </state>
       </provider>
diff --git a/serve.py b/serve.py
index a81652b..273c8f3 100644
--- a/serve.py
+++ b/serve.py
@@ -156,9 +156,9 @@ def draw_yqy(config2, origin_data, predict_norm_data, mean_yqy, std_yqy):
 
 	print("2")
 
-	label_data = label_norm_data[:, 1] * std_yqy[1] + mean_yqy[1]
+	label_data = label_norm_data[:, 5:8] * std_yqy[:, 5:8] + mean_yqy[:, 5:8]
 
-	predict_data = predict_norm_data * std_yqy[1] + mean_yqy[1]
+	predict_data = predict_norm_data * std_yqy[:, 5:8] + mean_yqy[:, 5:8]
 
 	print(label_data)
 	print(predict_data)