1
0
mirror of https://github.com/newnius/YAO-optimizer.git synced 2025-06-07 07:01:56 +00:00
This commit is contained in:
Newnius 2020-05-02 15:08:06 +08:00
parent d18488c05f
commit bda8bd6ffc
2 changed files with 35 additions and 37 deletions

View File

@ -3,6 +3,7 @@
<component name="ChangeListManager"> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/train.py" beforeDir="false" afterPath="$PROJECT_DIR$/train.py" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -50,7 +51,7 @@
<entry key="csv" value="9" /> <entry key="csv" value="9" />
<entry key="gitignore" value="12" /> <entry key="gitignore" value="12" />
<entry key="md" value="104" /> <entry key="md" value="104" />
<entry key="py" value="2886" /> <entry key="py" value="2919" />
<entry key="sh" value="5" /> <entry key="sh" value="5" />
</counts> </counts>
</usages-collector> </usages-collector>
@ -60,7 +61,7 @@
<entry key="Dockerfile" value="81" /> <entry key="Dockerfile" value="81" />
<entry key="Markdown" value="104" /> <entry key="Markdown" value="104" />
<entry key="PLAIN_TEXT" value="21" /> <entry key="PLAIN_TEXT" value="21" />
<entry key="Python" value="2886" /> <entry key="Python" value="2919" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
@ -104,8 +105,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/train.py"> <entry file="file://$PROJECT_DIR$/train.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246"> <state relative-caret-position="209">
<caret line="69" column="66" lean-forward="true" selection-start-line="69" selection-start-column="66" selection-end-line="69" selection-end-column="66" /> <caret line="68" column="62" selection-start-line="68" selection-start-column="62" selection-end-line="68" selection-end-column="62" />
<folding> <folding>
<element signature="e#0#28#0" expanded="true" /> <element signature="e#0#28#0" expanded="true" />
</folding> </folding>
@ -243,7 +244,7 @@
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588402982309" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588403211470" />
<property name="go.gopath.indexing.explicitly.defined" value="true" /> <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_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@ -284,15 +285,16 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1588152877746</updated> <updated>1588152877746</updated>
<workItem from="1588152880522" duration="16973000" /> <workItem from="1588152880522" duration="16973000" />
<workItem from="1588319878551" duration="29284000" /> <workItem from="1588319878551" duration="29529000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="46257000" /> <option name="totallyTimeSpent" value="46502000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1280" height="800" extended-state="0" /> <frame x="0" y="0" width="1280" height="800" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info id="Designer" order="0" /> <window_info id="Designer" order="0" />
<window_info id="UI Designer" order="1" /> <window_info id="UI Designer" order="1" />
@ -364,27 +366,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="105">
<caret line="7" column="6" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/serve.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1056">
<caret line="43" column="16" lean-forward="true" selection-start-line="43" selection-start-column="16" selection-end-line="43" selection-end-column="16" />
<folding>
<element signature="e#18#46#0" expanded="true" />
<marker date="1588357497851" expanded="true" signature="5576:5578" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/model_tensorflow.py"> <entry file="file://$PROJECT_DIR$/model_tensorflow.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="642"> <state relative-caret-position="642">
@ -423,6 +404,27 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="105">
<caret line="7" column="6" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/serve.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1056">
<caret line="43" column="16" lean-forward="true" selection-start-line="43" selection-start-column="16" selection-end-line="43" selection-end-column="16" />
<folding>
<element signature="e#18#46#0" expanded="true" />
<marker date="1588357497851" expanded="true" signature="5576:5578" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main.py"> <entry file="file://$PROJECT_DIR$/main.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="302"> <state relative-caret-position="302">
@ -435,8 +437,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/train.py"> <entry file="file://$PROJECT_DIR$/train.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246"> <state relative-caret-position="209">
<caret line="69" column="66" lean-forward="true" selection-start-line="69" selection-start-column="66" selection-end-line="69" selection-end-column="66" /> <caret line="68" column="62" selection-start-line="68" selection-start-column="62" selection-end-line="68" selection-end-column="62" />
<folding> <folding>
<element signature="e#0#28#0" expanded="true" /> <element signature="e#0#28#0" expanded="true" />
</folding> </folding>

View File

@ -61,20 +61,16 @@ def invert_scale(scaler, X, yhat):
# fit an LSTM network to training data # fit an LSTM network to training data
def fit_lstm(train, batch_size2, nb_epoch, neurons): def fit_lstm(train, batch_size2, nb_epoch, neurons):
print(train)
X, y = train[:, 0:-1], train[:, -1] X, y = train[:, 0:-1], train[:, -1]
X = X.reshape(X.shape[0], 1, X.shape[1]) X = X.reshape(X.shape[0], 1, X.shape[1])
print(X, y)
model = Sequential() model = Sequential()
model.add(LSTM(neurons, batch_input_shape=(batch_size2, X.shape[1], X.shape[2]), stateful=True)) model.add(LSTM(neurons, batch_input_shape=(batch_size2, X.shape[1], X.shape[2]), stateful=True))
model.add(Dense(1)) model.add(Dense(1))
model.compile(loss='mean_squared_error', optimizer=Adam(lr=0.01)) model.compile(loss='mean_squared_error', optimizer='adam')
for i in range(nb_epoch): for i in range(nb_epoch):
print("Epoch {}/{}".format(i, nb_epoch))
model.fit(X, y, epochs=1, batch_size=batch_size2, verbose=0, shuffle=False) model.fit(X, y, epochs=1, batch_size=batch_size2, verbose=0, shuffle=False)
#loss, accuracy = model.evaluate(X, y) loss = model.evaluate(X, y)
print(model.evaluate(X, y)) print("Epoch {}/{}, loss = {}".format(i, nb_epoch, loss))
#print(loss, accuracy)
model.reset_states() model.reset_states()
return model return model