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:42:01 +08:00
parent 34f2824db8
commit 97c839d344
2 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
.idea/workspace.xml generated
View File

@@ -2,7 +2,8 @@
<project version="4"> <project version="4">
<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$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" /> <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> </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" />
@@ -22,53 +23,48 @@
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="iml" value="1" /> <entry key="iml" value="1" />
<entry key="py" value="2" /> <entry key="py" value="4" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="IDEA_MODULE" value="1" /> <entry key="IDEA_MODULE" value="1" />
<entry key="Python" value="2" /> <entry key="Python" value="4" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="py" value="161" /> <entry key="py" value="187" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="Python" value="161" /> <entry key="Python" value="187" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/serve.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="206"> <state relative-caret-position="-2423">
<caret line="66" column="15" selection-start-line="66" selection-start-column="15" selection-end-line="66" selection-end-column="15" /> <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
<folding> <folding>
<element signature="e#0#23#0" expanded="true" /> <element signature="e#0#19#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/yao-optimizer.iml"> <entry file="file://$PROJECT_DIR$/model/model_tensorflow.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="-488">
<caret line="52" column="30" selection-start-line="52" selection-start-column="30" selection-end-line="52" selection-end-column="30" /> <caret line="48" selection-start-line="48" selection-end-line="48" />
<folding> <folding>
<element signature="e#0#19#0" expanded="true" /> <element signature="e#0#23#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -96,6 +92,8 @@
<list> <list>
<option value="$PROJECT_DIR$/test.py" /> <option value="$PROJECT_DIR$/test.py" />
<option value="$PROJECT_DIR$/serve.py" /> <option value="$PROJECT_DIR$/serve.py" />
<option value="$PROJECT_DIR$/main.py" />
<option value="$PROJECT_DIR$/model/model_tensorflow.py" />
</list> </list>
</option> </option>
</component> </component>
@@ -124,6 +122,11 @@
<item name="yao-optimizer" type="b2602c69:ProjectViewProjectNode" /> <item name="yao-optimizer" type="b2602c69:ProjectViewProjectNode" />
<item name="yao-optimizer" type="462c0819:PsiDirectoryNode" /> <item name="yao-optimizer" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="yao-optimizer" type="b2602c69:ProjectViewProjectNode" />
<item name="yao-optimizer" type="462c0819:PsiDirectoryNode" />
<item name="model" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
@@ -134,7 +137,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="1588156758264" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588156795237" />
<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" />
@@ -165,12 +168,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1588152877746</updated> <updated>1588152877746</updated>
<workItem from="1588152880522" duration="3067000" /> <workItem from="1588152880522" duration="3326000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="3067000" /> <option name="totallyTimeSpent" value="3326000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1280" height="704" extended-state="6" /> <frame x="0" y="23" width="1280" height="704" extended-state="6" />
@@ -228,8 +231,28 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/serve.py"> <entry file="file://$PROJECT_DIR$/serve.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206"> <state relative-caret-position="161">
<caret line="66" column="15" selection-start-line="66" selection-start-column="15" selection-end-line="66" selection-end-column="15" /> <caret line="63" column="29" lean-forward="true" selection-start-line="63" selection-start-column="29" selection-end-line="63" selection-end-column="29" />
<folding>
<element signature="e#0#23#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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" />
<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="-488">
<caret line="48" selection-start-line="48" selection-end-line="48" />
<folding> <folding>
<element signature="e#0#23#0" expanded="true" /> <element signature="e#0#23#0" expanded="true" />
</folding> </folding>

12
main.py
View File

@@ -4,14 +4,7 @@ import os
from sklearn.model_selection import train_test_split from sklearn.model_selection import train_test_split
frame = "tensorflow" frame = "tensorflow"
if frame == "pytorch": from model.model_tensorflow import train, predict
from model.model_pytorch import train, predict
elif frame == "keras":
from model.model_keras import train, predict
elif frame == "tensorflow":
from model.model_tensorflow import train, predict
else:
raise Exception("Wrong frame seletion")
class Config: class Config:
@@ -143,6 +136,9 @@ def draw(config, origin_data, predict_norm_data):
predict_data = predict_norm_data * origin_data.std[config.label_in_feature_columns] + \ predict_data = predict_norm_data * origin_data.std[config.label_in_feature_columns] + \
origin_data.mean[config.label_in_feature_columns] origin_data.mean[config.label_in_feature_columns]
print(label_data)
print(predict_data)
''' '''
for i in range(label_column_num): for i in range(label_column_num):
plt.figure(i + 1) plt.figure(i + 1)