From 399903a965d05cb34dff68704c05b277eca27d16 Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Sat, 2 May 2020 01:11:37 +0800
Subject: [PATCH] update

---
 .idea/workspace.xml | 23 ++++++++++++-----------
 serve.py            | 15 ++++++---------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 655bc0b..00980c1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,7 @@
 <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" />
       <change beforePath="$PROJECT_DIR$/serve.py" beforeDir="false" afterPath="$PROJECT_DIR$/serve.py" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -47,7 +48,7 @@
         <counts>
           <entry key="Dockerfile" value="75" />
           <entry key="md" value="104" />
-          <entry key="py" value="2232" />
+          <entry key="py" value="2265" />
           <entry key="sh" value="5" />
         </counts>
       </usages-collector>
@@ -56,7 +57,7 @@
           <entry key="Bash" value="5" />
           <entry key="Dockerfile" value="75" />
           <entry key="Markdown" value="104" />
-          <entry key="Python" value="2232" />
+          <entry key="Python" value="2265" />
         </counts>
       </usages-collector>
     </session>
@@ -78,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="278">
-              <caret line="183" column="26" selection-start-line="183" selection-start-column="26" selection-end-line="183" selection-end-column="26" />
+            <state relative-caret-position="287">
+              <caret line="156" lean-forward="true" selection-start-line="156" selection-end-line="156" />
               <folding>
                 <element signature="e#18#46#0" expanded="true" />
-                <marker date="1588352306315" expanded="true" signature="5576:5578" ph="..." />
+                <marker date="1588352857258" expanded="true" signature="5557:5559" ph="..." />
               </folding>
             </state>
           </provider>
@@ -207,7 +208,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="1588352157389" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588352857448" />
     <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" />
@@ -248,12 +249,12 @@
       <option name="presentableId" value="Default" />
       <updated>1588152877746</updated>
       <workItem from="1588152880522" duration="16973000" />
-      <workItem from="1588319878551" duration="12480000" />
+      <workItem from="1588319878551" duration="12852000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="29453000" />
+    <option name="totallyTimeSpent" value="29825000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
@@ -368,11 +369,11 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/serve.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="278">
-          <caret line="183" column="26" selection-start-line="183" selection-start-column="26" selection-end-line="183" selection-end-column="26" />
+        <state relative-caret-position="287">
+          <caret line="156" lean-forward="true" selection-start-line="156" selection-end-line="156" />
           <folding>
             <element signature="e#18#46#0" expanded="true" />
-            <marker date="1588352306315" expanded="true" signature="5576:5578" ph="..." />
+            <marker date="1588352857258" expanded="true" signature="5557:5559" ph="..." />
           </folding>
         </state>
       </provider>
diff --git a/serve.py b/serve.py
index 3a50801..876dc66 100644
--- a/serve.py
+++ b/serve.py
@@ -35,7 +35,7 @@ class Config:
 	shuffle_train_data = True
 
 	# train_data_rate = 0.95 #comment yqy
-	train_data_rate = 1  # add yqy
+	train_data_rate = 0.95  # add yqy
 	valid_data_rate = 0.15
 
 	batch_size = 64
@@ -140,7 +140,6 @@ 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
@@ -152,16 +151,14 @@ 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("2")
-
-	print(label_norm_data[:, 1:2])
+	# 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(label_data)
 
-	print(predict_norm_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])
@@ -330,7 +327,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