From 30ea099b2b7edd3f914fa05c79ae197d646e1fae Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Wed, 29 Apr 2020 18:50:53 +0800
Subject: [PATCH] add files

---
 .idea/workspace.xml       | 53 ++++++++++++++++++++-------------------
 main.py                   |  4 +--
 model/model_tensorflow.py | 11 ++++----
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 354c3bb..1ae2f58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,8 @@
   <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$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/model/model_tensorflow.py" beforeDir="false" afterPath="$PROJECT_DIR$/model/model_tensorflow.py" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -35,23 +37,23 @@
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="py" value="218" />
+          <entry key="py" value="266" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="Python" value="218" />
+          <entry key="Python" value="266" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
+      <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="136">
-              <caret line="10" column="16" lean-forward="true" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
+            <state relative-caret-position="208">
+              <caret line="170" column="51" selection-start-line="170" selection-start-column="51" selection-end-line="170" selection-end-column="51" />
               <folding>
                 <element signature="e#0#19#0" expanded="true" />
               </folding>
@@ -59,11 +61,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/model/model_tensorflow.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="84" column="29" lean-forward="true" selection-start-line="84" selection-start-column="29" selection-end-line="84" selection-end-column="29" />
+            <state relative-caret-position="206">
+              <caret line="84" column="5" selection-start-line="84" selection-start-column="5" selection-end-line="84" selection-end-column="5" />
               <folding>
                 <element signature="e#0#23#0" expanded="true" />
               </folding>
@@ -153,7 +155,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="1588157156425" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588157416374" />
     <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" />
@@ -184,26 +186,25 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1588152877746</updated>
-      <workItem from="1588152880522" duration="3569000" />
+      <workItem from="1588152880522" duration="3837000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="3569000" />
+    <option name="totallyTimeSpent" value="3837000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1280" height="704" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info id="Designer" order="0" />
       <window_info id="UI Designer" order="1" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info id="Image Layers" order="4" />
-      <window_info active="true" content_ui="combo" id="Project" order="5" visible="true" weight="0.24959612" />
+      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.24959612" />
       <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Version Control" order="0" />
-      <window_info anchor="bottom" id="Terminal" order="1" visible="true" weight="0.32843137" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.32843137" />
       <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Database Changes" order="3" show_stripe_button="false" />
       <window_info anchor="bottom" id="Docker" order="4" show_stripe_button="false" />
@@ -256,29 +257,29 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/model/model_tensorflow.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="84" column="29" lean-forward="true" selection-start-line="84" selection-start-column="29" selection-end-line="84" selection-end-column="29" />
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/data/stock_data.csv">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="10" column="16" lean-forward="true" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
+        <state relative-caret-position="208">
+          <caret line="170" column="51" selection-start-line="170" selection-start-column="51" selection-end-line="170" selection-end-column="51" />
           <folding>
             <element signature="e#0#19#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/model/model_tensorflow.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="206">
+          <caret line="84" column="5" selection-start-line="84" selection-start-column="5" selection-end-line="84" selection-end-column="5" />
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/main.py b/main.py
index 51505a6..9d6b71b 100644
--- a/main.py
+++ b/main.py
@@ -164,11 +164,11 @@ def main(config):
 
 	if config.do_train:
 		train_X, valid_X, train_Y, valid_Y = data_gainer.get_train_and_valid_data()
-		model = train(config, train_X, train_Y, valid_X, valid_Y)
+		train(config, train_X, train_Y, valid_X, valid_Y)
 
 	if config.do_predict:
 		test_X, test_Y = data_gainer.get_test_data(return_label_data=True)
-		pred_result = predict(config, test_X, model)
+		pred_result = predict(config, test_X)
 		draw(config, data_gainer, pred_result)
 
 
diff --git a/model/model_tensorflow.py b/model/model_tensorflow.py
index 634f724..a07ea22 100644
--- a/model/model_tensorflow.py
+++ b/model/model_tensorflow.py
@@ -76,19 +76,18 @@ def train(config, train_X, train_Y, valid_X, valid_Y):
 				if bad_epoch >= config.patience:
 					print(" The training stops early in epoch {}".format(epoch))
 					break
-	return model
 
 
-def predict(config, test_X, model):
+def predict(config, test_X):
 	config.dropout_rate = 0.1
 
-	#with tf.variable_scope("stock_predict", reuse=tf.AUTO_REUSE):
-		#model = Model(config)
+	with tf.variable_scope("stock_predict", reuse=tf.AUTO_REUSE):
+		model = Model(config)
 
 	test_len = len(test_X)
 	with tf.Session() as sess:
-		#module_file = tf.train.latest_checkpoint(config.model_save_path)
-		#model.saver.restore(sess, module_file)
+		module_file = tf.train.latest_checkpoint(config.model_save_path + config.model_name)
+		model.saver.restore(sess, module_file)
 
 		result = np.zeros((test_len * config.time_step, config.output_size))
 		for step in range(test_len):