YAO/YAO-optimizer
1
0
Fork 0
mirror of https://github.com/newnius/YAO-optimizer.git synced 2025-12-13 08:26:43 +00:00
Code Issues Releases Wiki Activity

add files

Browse Source
This commit is contained in:
Newnius
2020-04-29 18:48:42 +08:00
parent 9d7c30d36c
commit dca3c383ea
3 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
.idea/workspace.xml generated
View File

@@ -3,7 +3,6 @@
<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$/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" />
@@ -22,6 +21,7 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="csv" value="1" />
<entry key="iml" value="1" />
<entry key="py" value="4" />
</counts>
@@ -29,28 +29,29 @@
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="IDEA_MODULE" value="1" />
<entry key="PLAIN_TEXT" value="1" />
<entry key="Python" value="4" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="py" value="187" />
<entry key="py" value="218" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Python" value="187" />
<entry key="Python" value="218" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/main.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2423">
<caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
<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" />
<folding>
<element signature="e#0#19#0" expanded="true" />
</folding>
@@ -58,11 +59,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/model/model_tensorflow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-488">
<caret line="48" selection-start-line="48" selection-end-line="48" />
<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>
@@ -70,6 +71,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/data/stock_data.csv">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -122,6 +128,16 @@
<item name="yao-optimizer" type="b2602c69:ProjectViewProjectNode" />
<item name="yao-optimizer" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="yao-optimizer" type="b2602c69:ProjectViewProjectNode" />
<item name="yao-optimizer" type="462c0819:PsiDirectoryNode" />
<item name="data" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="yao-optimizer" type="b2602c69:ProjectViewProjectNode" />
<item name="yao-optimizer" type="462c0819:PsiDirectoryNode" />
<item name="figure" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="yao-optimizer" type="b2602c69:ProjectViewProjectNode" />
<item name="yao-optimizer" type="462c0819:PsiDirectoryNode" />
@@ -137,7 +153,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="1588156950124" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588157156425" />
<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" />
@@ -168,25 +184,26 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1588152877746</updated>
<workItem from="1588152880522" duration="3326000" />
<workItem from="1588152880522" duration="3569000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="3326000" />
<option name="totallyTimeSpent" value="3569000" />
</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 content_ui="combo" id="Project" order="5" visible="true" weight="0.24959612" />
<window_info active="true" 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 active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.32843137" />
<window_info 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" />
@@ -239,22 +256,25 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main.py">
<entry file="file://$PROJECT_DIR$/model/model_tensorflow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2423">
<caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
<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#19#0" expanded="true" />
<element signature="e#0#23#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/model/model_tensorflow.py">
<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="-488">
<caret line="48" selection-start-line="48" selection-end-line="48" />
<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" />
<folding>
<element signature="e#0#23#0" expanded="true" />
<element signature="e#0#19#0" expanded="true" />
</folding>
</state>
</provider>

4
main.py
View File

@@ -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()
train(config, train_X, train_Y, valid_X, valid_Y)
model = 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)
pred_result = predict(config, test_X, model)
draw(config, data_gainer, pred_result)

11
model/model_tensorflow.py
View File

@@ -76,18 +76,19 @@ 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):
def predict(config, test_X, model):
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)
#model.saver.restore(sess, module_file)
result = np.zeros((test_len * config.time_step, config.output_size))
for step in range(test_len):