YAO/YAO-optimizer
1
0
Fork 0
mirror of https://github.com/newnius/YAO-optimizer.git synced 2025-06-07 07:01:56 +00:00
Code Issues Releases Wiki Activity

make sure tmp testfile is removed

Browse Source
This commit is contained in:
Newnius 2020-07-09 22:50:39 +08:00
parent fd7ac13ce0
commit a178107abd
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
.idea/workspace.xml
View File

@ -2,6 +2,7 @@
<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$/.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" /> <change beforePath="$PROJECT_DIR$/serve.py" beforeDir="false" afterPath="$PROJECT_DIR$/serve.py" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
@ -53,7 +54,7 @@
<entry key="dummy" value="5" /> <entry key="dummy" value="5" />
<entry key="gitignore" value="12" /> <entry key="gitignore" value="12" />
<entry key="md" value="234" /> <entry key="md" value="234" />
<entry key="py" value="6143" /> <entry key="py" value="6158" />
<entry key="sh" value="546" /> <entry key="sh" value="546" />
</counts> </counts>
</usages-collector> </usages-collector>
@ -63,7 +64,7 @@
<entry key="Dockerfile" value="81" /> <entry key="Dockerfile" value="81" />
<entry key="Markdown" value="234" /> <entry key="Markdown" value="234" />
<entry key="PLAIN_TEXT" value="26" /> <entry key="PLAIN_TEXT" value="26" />
<entry key="Python" value="6143" /> <entry key="Python" value="6158" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
@ -73,8 +74,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<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="-149"> <state relative-caret-position="-121">
<caret line="85" column="34" lean-forward="true" selection-start-line="85" selection-start-column="34" selection-end-line="85" selection-end-column="34" /> <caret line="79" lean-forward="true" selection-start-line="79" selection-end-line="79" />
<folding> <folding>
<element signature="e#18#46#0" expanded="true" /> <element signature="e#18#46#0" expanded="true" />
</folding> </folding>
@ -85,8 +86,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/compare.sh"> <entry file="file://$PROJECT_DIR$/compare.sh">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="60">
<caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" /> <caret line="4" column="27" lean-forward="true" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -94,8 +95,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/rf.py"> <entry file="file://$PROJECT_DIR$/rf.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state>
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" /> <caret column="15" selection-start-column="12" selection-end-column="15" />
<folding> <folding>
<element signature="e#21#39#0" expanded="true" /> <element signature="e#21#39#0" expanded="true" />
<marker date="1593568816783" expanded="true" signature="1440:1442" ph="..." /> <marker date="1593568816783" expanded="true" signature="1440:1442" ph="..." />
@ -138,6 +139,7 @@
<find>range</find> <find>range</find>
<find>exist</find> <find>exist</find>
<find>trace</find> <find>trace</find>
<find>utf</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
@ -204,7 +206,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="1593593921497" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1594305792246" />
<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" />
@ -249,12 +251,12 @@
<workItem from="1588319878551" duration="41219000" /> <workItem from="1588319878551" duration="41219000" />
<workItem from="1588426002721" duration="336000" /> <workItem from="1588426002721" duration="336000" />
<workItem from="1588427782140" duration="326000" /> <workItem from="1588427782140" duration="326000" />
<workItem from="1592809729651" duration="27301000" /> <workItem from="1592809729651" duration="32176000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="86155000" /> <option name="totallyTimeSpent" value="91030000" />
</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" />
@ -416,17 +418,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/compare.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/rf.py"> <entry file="file://$PROJECT_DIR$/rf.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state>
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" /> <caret column="15" selection-start-column="12" selection-end-column="15" />
<folding> <folding>
<element signature="e#21#39#0" expanded="true" /> <element signature="e#21#39#0" expanded="true" />
<marker date="1593568816783" expanded="true" signature="1440:1442" ph="..." /> <marker date="1593568816783" expanded="true" signature="1440:1442" ph="..." />
@ -434,10 +429,17 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/compare.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="27" lean-forward="true" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
</state>
</provider>
</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="-149"> <state relative-caret-position="-121">
<caret line="85" column="34" lean-forward="true" selection-start-line="85" selection-start-column="34" selection-end-line="85" selection-end-column="34" /> <caret line="79" lean-forward="true" selection-start-line="79" selection-end-line="79" />
<folding> <folding>
<element signature="e#18#46#0" expanded="true" /> <element signature="e#18#46#0" expanded="true" />
</folding> </folding>

14
serve.py
View File

@ -78,24 +78,24 @@ def predict(job, features):
for feature in models[job]['features']: for feature in models[job]['features']:
values.append(features[feature]) values.append(features[feature])
datafile = './data/' + job + '.' + str(random.randint(1000, 9999)) + '.csv' testfile = './data/' + job + '.' + str(random.randint(1000, 9999)) + '.csv'
t = ['job'] t = ['job']
t.extend(models[job]['features']) t.extend(models[job]['features'])
with open(datafile, 'w', newline='') as csvfile: with open(testfile, 'w', newline='') as csvfile:
spamwriter = csv.writer( spamwriter = csv.writer(
csvfile, delimiter=',', csvfile, delimiter=',',
quotechar='|', quoting=csv.QUOTE_MINIMAL quotechar='|', quoting=csv.QUOTE_MINIMAL
) )
spamwriter.writerow(t) spamwriter.writerow(t)
with open(datafile, 'a+', newline='') as csvfile: with open(testfile, 'a+', newline='') as csvfile:
spamwriter = csv.writer( spamwriter = csv.writer(
csvfile, delimiter=',', csvfile, delimiter=',',
quotechar='|', quoting=csv.QUOTE_MINIMAL quotechar='|', quoting=csv.QUOTE_MINIMAL
) )
spamwriter.writerow(values) spamwriter.writerow(values)
testdata = pd.read_csv(datafile) testdata = pd.read_csv(testfile)
test_feature = testdata.iloc[:, 1:] test_feature = testdata.iloc[:, 1:]
predictions = {} predictions = {}
@ -103,13 +103,15 @@ def predict(job, features):
# load the model from disk # load the model from disk
modelfile = './data/' + job + '_' + label + '.sav' modelfile = './data/' + job + '_' + label + '.sav'
if not os.path.exists(modelfile): if not os.path.exists(modelfile):
if os.path.exists(testfile):
os.remove(testfile)
return -1, False return -1, False
model = pickle.load(open(modelfile, 'rb')) model = pickle.load(open(modelfile, 'rb'))
preds = model.predict(test_feature) preds = model.predict(test_feature)
predictions[label] = preds[0] predictions[label] = preds[0]
if os.path.exists(datafile): if os.path.exists(testfile):
os.remove(datafile) os.remove(testfile)
return predictions, True return predictions, True