Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
1
1-homework-yanjun
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bonnieyan
1-homework-yanjun
Commits
07ec68e2
Commit
07ec68e2
authored
Feb 13, 2019
by
bonnieyan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
homework
parent
0cbdaa3f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
255 additions
and
97 deletions
+255
-97
.idea/workspace.xml
+114
-92
10-homework-yanjun/multiprocess_cal_salary.py
+8
-5
10-homework-yanjun/my.log
+104
-0
11-homework-yanjun/sql
+29
-0
No files found.
.idea/workspace.xml
View file @
07ec68e2
...
...
@@ -2,14 +2,10 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"f3bb3c2c-9e73-427c-b6cc-e08fb6afe6b8"
name=
"Default Changelist"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/10-homework-yanjun/mergeTwoLists.py"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/10-homework-yanjun/min_stack.py"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/10-homework-yanjun/multiprocess_cal_salary.py"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/10-homework-yanjun/nim.py"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/10-homework-yanjun/search_for_common_ancestor.py"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/10-homework-yanjun/stock_sale.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/7-homework-yanjun/matrix.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/7-homework-yanjun/matrix.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/9-homework-yanjun/my.log"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/9-homework-yanjun/my.log"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/11-homework-yanjun/sql"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/10-homework-yanjun/multiprocess_cal_salary.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/10-homework-yanjun/multiprocess_cal_salary.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/10-homework-yanjun/my.log"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/10-homework-yanjun/my.log"
afterDir=
"false"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
...
...
@@ -30,7 +26,7 @@
<SUITE
FILE_PATH=
"coverage/1_homework_yanjun$search_for_common_ancestor.coverage"
NAME=
"search_for_common_ancestor Coverage Results"
MODIFIED=
"1549892087906"
SOURCE_PROVIDER=
"com.intellij.coverage.DefaultCoverageFileProvider"
RUNNER=
"coverage.py"
COVERAGE_BY_TEST_ENABLED=
"true"
COVERAGE_TRACING_ENABLED=
"false"
WORKING_DIRECTORY=
"$PROJECT_DIR$/10-homework-yanjun"
/>
<SUITE
FILE_PATH=
"coverage/1_homework_yanjun$calculate_salary.coverage"
NAME=
"calculate_salary Coverage Results"
MODIFIED=
"1548570184539"
SOURCE_PROVIDER=
"com.intellij.coverage.DefaultCoverageFileProvider"
RUNNER=
"coverage.py"
COVERAGE_BY_TEST_ENABLED=
"true"
COVERAGE_TRACING_ENABLED=
"false"
WORKING_DIRECTORY=
"$PROJECT_DIR$/9-homework-yanjun"
/>
<SUITE
FILE_PATH=
"coverage/1_homework_yanjun$min_stack.coverage"
NAME=
"min_stack Coverage Results"
MODIFIED=
"1549894536160"
SOURCE_PROVIDER=
"com.intellij.coverage.DefaultCoverageFileProvider"
RUNNER=
"coverage.py"
COVERAGE_BY_TEST_ENABLED=
"true"
COVERAGE_TRACING_ENABLED=
"false"
WORKING_DIRECTORY=
"$PROJECT_DIR$/10-homework-yanjun"
/>
<SUITE
FILE_PATH=
"coverage/1_homework_yanjun$multiprocess_cal_salary.coverage"
NAME=
"multiprocess_cal_salary Coverage Results"
MODIFIED=
"15
49898198454
"
SOURCE_PROVIDER=
"com.intellij.coverage.DefaultCoverageFileProvider"
RUNNER=
"coverage.py"
COVERAGE_BY_TEST_ENABLED=
"true"
COVERAGE_TRACING_ENABLED=
"false"
WORKING_DIRECTORY=
"$PROJECT_DIR$/10-homework-yanjun"
/>
<SUITE
FILE_PATH=
"coverage/1_homework_yanjun$multiprocess_cal_salary.coverage"
NAME=
"multiprocess_cal_salary Coverage Results"
MODIFIED=
"15
50070761641
"
SOURCE_PROVIDER=
"com.intellij.coverage.DefaultCoverageFileProvider"
RUNNER=
"coverage.py"
COVERAGE_BY_TEST_ENABLED=
"true"
COVERAGE_TRACING_ENABLED=
"false"
WORKING_DIRECTORY=
"$PROJECT_DIR$/10-homework-yanjun"
/>
<SUITE
FILE_PATH=
"coverage/1_homework_yanjun$goat_latin.coverage"
NAME=
"goat_latin Coverage Results"
MODIFIED=
"1547473795027"
SOURCE_PROVIDER=
"com.intellij.coverage.DefaultCoverageFileProvider"
RUNNER=
"coverage.py"
COVERAGE_BY_TEST_ENABLED=
"true"
COVERAGE_TRACING_ENABLED=
"false"
WORKING_DIRECTORY=
"$PROJECT_DIR$/5-homework-yanjun"
/>
<SUITE
FILE_PATH=
"coverage/1_homework_yanjun$file_operate.coverage"
NAME=
"file_operate Coverage Results"
MODIFIED=
"1548504575381"
SOURCE_PROVIDER=
"com.intellij.coverage.DefaultCoverageFileProvider"
RUNNER=
"coverage.py"
COVERAGE_BY_TEST_ENABLED=
"true"
COVERAGE_TRACING_ENABLED=
"false"
WORKING_DIRECTORY=
"$PROJECT_DIR$/9-homework-yanjun"
/>
<SUITE
FILE_PATH=
"coverage/1_homework_yanjun$heaters.coverage"
NAME=
"heaters Coverage Results"
MODIFIED=
"1547904223596"
SOURCE_PROVIDER=
"com.intellij.coverage.DefaultCoverageFileProvider"
RUNNER=
"coverage.py"
COVERAGE_BY_TEST_ENABLED=
"true"
COVERAGE_TRACING_ENABLED=
"false"
WORKING_DIRECTORY=
"$PROJECT_DIR$/6-homework-yanjun"
/>
...
...
@@ -46,7 +42,7 @@
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/9-homework-yanjun/my.log"
>
<provider
selected=
"true"
editor-type-id=
"LogFileEditorProvider"
>
<state
relative-caret-position=
"
-50
6"
>
<state
relative-caret-position=
"
39
6"
>
<caret
line=
"18"
column=
"45"
selection-start-line=
"18"
selection-start-column=
"45"
selection-end-line=
"18"
selection-end-column=
"45"
/>
</state>
</provider>
...
...
@@ -55,7 +51,7 @@
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/9-homework-yanjun/calculate_salary.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-792
"
>
<state
relative-caret-position=
"
1166
"
>
<caret
line=
"57"
column=
"31"
selection-start-line=
"57"
selection-start-column=
"29"
selection-end-line=
"57"
selection-end-column=
"31"
/>
<folding>
<element
signature=
"e#0#11#0"
expanded=
"true"
/>
...
...
@@ -64,11 +60,11 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/10-homework-yanjun/multiprocess_cal_salary.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
366
"
>
<caret
line=
"1
16"
lean-forward=
"true"
selection-start-line=
"116"
selection-end-line=
"116
"
/>
<state
relative-caret-position=
"
-1960
"
>
<caret
line=
"1
8"
selection-start-line=
"18"
selection-end-line=
"18
"
/>
<folding>
<element
signature=
"e#0#11#0"
expanded=
"true"
/>
</folding>
...
...
@@ -76,11 +72,38 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/11-homework-yanjun/sql"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"401"
>
<caret
line=
"27"
column=
"38"
selection-start-line=
"27"
selection-start-column=
"38"
selection-end-line=
"27"
selection-end-column=
"38"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file:///usr/lib/python3.6/
multiprocessing/pool
.py"
>
<entry
file=
"file:///usr/lib/python3.6/
logging/__init__
.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-1100"
>
<caret
line=
"351"
column=
"8"
lean-forward=
"true"
selection-start-line=
"351"
selection-start-column=
"8"
selection-end-line=
"351"
selection-end-column=
"49"
/>
<state
relative-caret-position=
"174"
>
<caret
line=
"1305"
selection-start-line=
"1305"
selection-end-line=
"1305"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file:///usr/lib/python3.6/locale.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"142"
>
<caret
line=
"580"
selection-start-line=
"580"
selection-end-line=
"580"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file:///usr/lib/python3.6/_strptime.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"164"
>
<caret
line=
"559"
selection-start-line=
"559"
selection-end-line=
"559"
/>
</state>
</provider>
</entry>
...
...
@@ -88,8 +111,8 @@
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/10-homework-yanjun/my.log"
>
<provider
selected=
"true"
editor-type-id=
"LogFileEditorProvider"
>
<state
relative-caret-position=
"
616
"
>
<caret
line=
"28"
lean-forward=
"true"
selection-start-line=
"24"
selection-start-column=
"33"
selection-end-line=
"28
"
/>
<state
relative-caret-position=
"
148
"
>
<caret
line=
"28"
selection-start-line=
"24"
selection-start-column=
"33"
selection-end-line=
"132
"
/>
</state>
</provider>
</entry>
...
...
@@ -135,6 +158,7 @@
<option
value=
"$PROJECT_DIR$/10-homework-yanjun/mergeTwoLists.py"
/>
<option
value=
"$PROJECT_DIR$/10-homework-yanjun/min_stack.py"
/>
<option
value=
"$PROJECT_DIR$/10-homework-yanjun/multiprocess_cal_salary.py"
/>
<option
value=
"$PROJECT_DIR$/11-homework-yanjun/sql"
/>
</list>
</option>
</component>
...
...
@@ -160,62 +184,11 @@
<path>
<item
name=
"1-homework-yanjun"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"1-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"2-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"1-homework-yanjun"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"1-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"3-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"1-homework-yanjun"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"1-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"4-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"1-homework-yanjun"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"1-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"5-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"1-homework-yanjun"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"1-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"6-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"1-homework-yanjun"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"1-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"7-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"1-homework-yanjun"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"1-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"8-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"1-homework-yanjun"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"1-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"9-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"1-homework-yanjun"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"1-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"9-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"new_image"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"1-homework-yanjun"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"1-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"10-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"1-homework-yanjun"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"External Libraries"
type=
"cb654da1:ExternalLibrariesNode"
/>
<item
name=
"11-homework-yanjun"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"1-homework-yanjun"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"External Libraries"
type=
"cb654da1:ExternalLibrariesNode"
/>
<item
name=
"< Python 3.6 >"
type=
"70bed36:NamedLibraryElementNode"
/>
</path>
</expand>
<select
/>
...
...
@@ -229,7 +202,7 @@
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$/../learning"
/>
<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=
"settings.editor.selected.configurable"
value=
"
project.propVCSSupport.Mappings
"
/>
<property
name=
"settings.editor.selected.configurable"
value=
"
com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable
"
/>
</component>
<component
name=
"RecentsManager"
>
<key
name=
"MoveFile.RECENT_KEYS"
>
...
...
@@ -396,7 +369,11 @@
<workItem
from=
"1548337204660"
duration=
"4579000"
/>
<workItem
from=
"1548502966618"
duration=
"5713000"
/>
<workItem
from=
"1548558786506"
duration=
"9281000"
/>
<workItem
from=
"1549889398962"
duration=
"9250000"
/>
<workItem
from=
"1549889398962"
duration=
"9653000"
/>
<workItem
from=
"1549979579435"
duration=
"1016000"
/>
<workItem
from=
"1549983189488"
duration=
"10000"
/>
<workItem
from=
"1549987678190"
duration=
"5000"
/>
<workItem
from=
"1550069133074"
duration=
"1987000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"提交第四次作业"
>
<created>
1547306387493
</created>
...
...
@@ -416,13 +393,13 @@
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"
67688
000"
/>
<option
name=
"totallyTimeSpent"
value=
"
71109
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"0"
y=
"0"
width=
"1920"
height=
"1005"
extended-state=
"6"
/>
<editor
active=
"true"
/>
<layout>
<window_info
active=
"true"
content_ui=
"combo"
id=
"Project"
order=
"0"
visible=
"true"
weight=
"0.1
7545748
"
/>
<window_info
active=
"true"
content_ui=
"combo"
id=
"Project"
order=
"0"
visible=
"true"
weight=
"0.1
8891281
"
/>
<window_info
id=
"Structure"
order=
"1"
side_tool=
"true"
weight=
"0.25"
/>
<window_info
id=
"Favorites"
order=
"2"
side_tool=
"true"
/>
<window_info
anchor=
"bottom"
id=
"Message"
order=
"0"
/>
...
...
@@ -463,6 +440,22 @@
<MESSAGE
value=
"提交第四次作业"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"提交第四次作业"
/>
</component>
<component
name=
"XDebuggerManager"
>
<breakpoint-manager>
<breakpoints>
<line-breakpoint
enabled=
"true"
suspend=
"THREAD"
type=
"python-line"
>
<url>
file://$PROJECT_DIR$/10-homework-yanjun/multiprocess_cal_salary.py
</url>
<line>
107
</line>
<option
name=
"timeStamp"
value=
"1"
/>
</line-breakpoint>
<line-breakpoint
enabled=
"true"
suspend=
"THREAD"
type=
"python-line"
>
<url>
file://$PROJECT_DIR$/10-homework-yanjun/multiprocess_cal_salary.py
</url>
<line>
111
</line>
<option
name=
"timeStamp"
value=
"2"
/>
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file:///usr/lib/python3.6/sre_compile.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
...
...
@@ -648,9 +641,16 @@
</state>
</provider>
</entry>
<entry
file=
"file://$APPLICATION_HOME_DIR$/helpers/typeshed/stdlib/3/multiprocessing/__init__.pyi"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"111"
>
<caret
line=
"35"
column=
"4"
selection-start-line=
"35"
selection-start-column=
"4"
selection-end-line=
"35"
selection-end-column=
"4"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/9-homework-yanjun/my.log"
>
<provider
selected=
"true"
editor-type-id=
"LogFileEditorProvider"
>
<state
relative-caret-position=
"
-50
6"
>
<state
relative-caret-position=
"
39
6"
>
<caret
line=
"18"
column=
"45"
selection-start-line=
"18"
selection-start-column=
"45"
selection-end-line=
"18"
selection-end-column=
"45"
/>
</state>
</provider>
...
...
@@ -660,46 +660,67 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/9-homework-yanjun/calculate_salary.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1166"
>
<caret
line=
"57"
column=
"31"
selection-start-line=
"57"
selection-start-column=
"29"
selection-end-line=
"57"
selection-end-column=
"31"
/>
<folding>
<element
signature=
"e#0#11#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file:///usr/lib/python3.6/multiprocessing/pool.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"383"
>
<caret
line=
"351"
column=
"8"
selection-start-line=
"351"
selection-start-column=
"8"
selection-end-line=
"351"
selection-end-column=
"49"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/10-homework-yanjun/my.log"
>
<provider
selected=
"true"
editor-type-id=
"LogFileEditorProvider"
>
<state
relative-caret-position=
"
616
"
>
<caret
line=
"28"
lean-forward=
"true"
selection-start-line=
"24"
selection-start-column=
"33"
selection-end-line=
"28
"
/>
<state
relative-caret-position=
"
148
"
>
<caret
line=
"28"
selection-start-line=
"24"
selection-start-column=
"33"
selection-end-line=
"132
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://
$APPLICATION_HOME_DIR$/helpers/typeshed/stdlib/3/multiprocessing/__init__.pyi
"
>
<entry
file=
"file://
/usr/lib/python3.6/locale.py
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
11
"
>
<caret
line=
"
35"
column=
"4"
selection-start-line=
"35"
selection-start-column=
"4"
selection-end-line=
"35"
selection-end-column=
"4
"
/>
<state
relative-caret-position=
"1
42
"
>
<caret
line=
"
580"
selection-start-line=
"580"
selection-end-line=
"580
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://
$PROJECT_DIR$/9-homework-yanjun/calculate_salary
.py"
>
<entry
file=
"file://
/usr/lib/python3.6/_strptime
.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-792"
>
<caret
line=
"57"
column=
"31"
selection-start-line=
"57"
selection-start-column=
"29"
selection-end-line=
"57"
selection-end-column=
"31"
/>
<folding>
<element
signature=
"e#0#11#0"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"164"
>
<caret
line=
"559"
selection-start-line=
"559"
selection-end-line=
"559"
/>
</state>
</provider>
</entry>
<entry
file=
"file:///usr/lib/python3.6/
multiprocessing/pool
.py"
>
<entry
file=
"file:///usr/lib/python3.6/
logging/__init__
.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-1100
"
>
<caret
line=
"
351"
column=
"8"
lean-forward=
"true"
selection-start-line=
"351"
selection-start-column=
"8"
selection-end-line=
"351"
selection-end-column=
"49
"
/>
<state
relative-caret-position=
"
174
"
>
<caret
line=
"
1305"
selection-start-line=
"1305"
selection-end-line=
"1305
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/10-homework-yanjun/multiprocess_cal_salary.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
366
"
>
<caret
line=
"1
16"
lean-forward=
"true"
selection-start-line=
"116"
selection-end-line=
"116
"
/>
<state
relative-caret-position=
"
-1960
"
>
<caret
line=
"1
8"
selection-start-line=
"18"
selection-end-line=
"18
"
/>
<folding>
<element
signature=
"e#0#11#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/11-homework-yanjun/sql"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"401"
>
<caret
line=
"27"
column=
"38"
selection-start-line=
"27"
selection-start-column=
"38"
selection-end-line=
"27"
selection-end-column=
"38"
/>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
10-homework-yanjun/multiprocess_cal_salary.py
View file @
07ec68e2
...
...
@@ -95,7 +95,7 @@ class Finace():
if
__name__
==
"__main__"
:
pool
=
multiprocessing
.
Pool
(
processes
=
4
)
list_work
=
[]
#
res = []
res
=
[]
worker
=
Worker
(
1
,
'小A'
,
'住在回龙观'
,
[{
"程序员"
:
2000
},
{
"扫地"
:
1000
}],
'2019-01-01'
,
'2019-01-31'
)
worker1
=
Worker
(
1
,
'小B'
,
'居住在天通苑'
,
[{
"程序员"
:
2000
}],
'2019-01-01'
,
'2019-01-31'
)
worker2
=
Worker
(
1
,
'小c'
,
'居住在西二旗'
,
[{
"程序员"
:
2000
}],
'2019-01-01'
,
'2019-01-31'
)
...
...
@@ -105,14 +105,17 @@ if __name__ == "__main__":
list_work
.
append
(
worker2
)
list_work
.
append
(
worker3
)
for
work
in
list_work
:
res
=
pool
.
apply_async
(
Finace
.
calc_salary
(
work
))
print
(
res
.
get
())
# res.append(res)
# res = pool.apply_async(Finace.calc_salary(work))
# print(res.get())
res
.
append
(
pool
.
apply_async
(
Finace
.
calc_salary
(
work
)))
print
(
res
)
pool
.
close
()
pool
.
join
()
#
# for r in res:
# Finace.write_excel(r)
# # Finace.write_excel(r)
# print(r.get())
...
...
10-homework-yanjun/my.log
View file @
07ec68e2
...
...
@@ -26,3 +26,107 @@
2019-02-11 23:16:38,526 - INFO - ['程序员', '扫地']
2019-02-11 23:16:38,526 - INFO - [8000, 4000]
2019-02-11 23:16:38,526 - INFO - [[1, '2019-1', '小A', '住在回龙观', '程序员', 8000, '工资结算4周', 8000], [1, '2019-1', '小A', '住在回龙观', '扫地', 4000, '工资结算4周', 12000]]
2019-02-13 22:45:58,980 - INFO - 4
2019-02-13 22:45:58,980 - INFO - ['程序员', '扫地']
2019-02-13 22:45:58,980 - INFO - [8000, 4000]
2019-02-13 22:45:58,980 - INFO - [[1, '2019-1', '小A', '住在回龙观', '程序员', 8000, '工资结算4周', 8000], [1, '2019-1', '小A', '住在回龙观', '扫地', 4000, '工资结算4周', 12000]]
2019-02-13 22:55:02,208 - INFO - 4
2019-02-13 22:55:02,208 - INFO - ['程序员', '扫地']
2019-02-13 22:55:02,208 - INFO - [8000, 4000]
2019-02-13 22:55:02,209 - INFO - [[1, '2019-1', '小A', '住在回龙观', '程序员', 8000, '工资结算4周', 8000], [1, '2019-1', '小A', '住在回龙观', '扫地', 4000, '工资结算4周', 12000]]
2019-02-13 22:56:34,437 - INFO - 4
2019-02-13 22:56:42,742 - INFO - ['程序员']
2019-02-13 22:56:43,249 - INFO - [8000]
2019-02-13 22:56:53,490 - INFO - [[1, '2019-1', '小B', '居住在天通苑', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 22:57:02,634 - INFO - 4
2019-02-13 22:57:02,634 - INFO - ['程序员']
2019-02-13 22:57:02,634 - INFO - [8000]
2019-02-13 22:57:02,634 - INFO - [[1, '2019-1', '小c', '居住在西二旗', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 22:57:04,431 - INFO - 4
2019-02-13 22:57:04,432 - INFO - ['程序员']
2019-02-13 22:57:04,432 - INFO - [8000]
2019-02-13 22:57:04,432 - INFO - [[1, '2019-1', '小D', '居住在天通苑', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:01:34,114 - INFO - 4
2019-02-13 23:01:34,114 - INFO - ['程序员', '扫地']
2019-02-13 23:01:34,114 - INFO - [8000, 4000]
2019-02-13 23:01:34,114 - INFO - [[1, '2019-1', '小A', '住在回龙观', '程序员', 8000, '工资结算4周', 8000], [1, '2019-1', '小A', '住在回龙观', '扫地', 4000, '工资结算4周', 12000]]
2019-02-13 23:04:49,302 - INFO - 4
2019-02-13 23:04:49,302 - INFO - ['程序员', '扫地']
2019-02-13 23:04:49,302 - INFO - [8000, 4000]
2019-02-13 23:04:49,302 - INFO - [[1, '2019-1', '小A', '住在回龙观', '程序员', 8000, '工资结算4周', 8000], [1, '2019-1', '小A', '住在回龙观', '扫地', 4000, '工资结算4周', 12000]]
2019-02-13 23:04:49,302 - INFO - 4
2019-02-13 23:04:49,302 - INFO - ['程序员']
2019-02-13 23:04:49,303 - INFO - [8000]
2019-02-13 23:04:49,303 - INFO - [[1, '2019-1', '小B', '居住在天通苑', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:04:49,303 - INFO - 4
2019-02-13 23:04:49,303 - INFO - ['程序员']
2019-02-13 23:04:49,303 - INFO - [8000]
2019-02-13 23:04:49,303 - INFO - [[1, '2019-1', '小c', '居住在西二旗', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:04:49,303 - INFO - 4
2019-02-13 23:04:49,303 - INFO - ['程序员']
2019-02-13 23:04:49,303 - INFO - [8000]
2019-02-13 23:04:49,303 - INFO - [[1, '2019-1', '小D', '居住在天通苑', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:05:12,366 - INFO - 4
2019-02-13 23:05:12,366 - INFO - ['程序员', '扫地']
2019-02-13 23:05:12,366 - INFO - [8000, 4000]
2019-02-13 23:05:12,366 - INFO - [[1, '2019-1', '小A', '住在回龙观', '程序员', 8000, '工资结算4周', 8000], [1, '2019-1', '小A', '住在回龙观', '扫地', 4000, '工资结算4周', 12000]]
2019-02-13 23:05:12,367 - INFO - 4
2019-02-13 23:05:12,367 - INFO - ['程序员']
2019-02-13 23:05:12,367 - INFO - [8000]
2019-02-13 23:05:12,367 - INFO - [[1, '2019-1', '小B', '居住在天通苑', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:05:12,367 - INFO - 4
2019-02-13 23:05:12,367 - INFO - ['程序员']
2019-02-13 23:05:12,367 - INFO - [8000]
2019-02-13 23:05:12,367 - INFO - [[1, '2019-1', '小c', '居住在西二旗', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:05:12,367 - INFO - 4
2019-02-13 23:05:12,367 - INFO - ['程序员']
2019-02-13 23:05:12,367 - INFO - [8000]
2019-02-13 23:05:12,367 - INFO - [[1, '2019-1', '小D', '居住在天通苑', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:06:03,516 - INFO - 4
2019-02-13 23:06:03,517 - INFO - ['程序员', '扫地']
2019-02-13 23:06:03,517 - INFO - [8000, 4000]
2019-02-13 23:06:03,517 - INFO - [[1, '2019-1', '小A', '住在回龙观', '程序员', 8000, '工资结算4周', 8000], [1, '2019-1', '小A', '住在回龙观', '扫地', 4000, '工资结算4周', 12000]]
2019-02-13 23:06:03,517 - INFO - 4
2019-02-13 23:06:03,517 - INFO - ['程序员']
2019-02-13 23:06:03,517 - INFO - [8000]
2019-02-13 23:06:03,517 - INFO - [[1, '2019-1', '小B', '居住在天通苑', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:06:03,517 - INFO - 4
2019-02-13 23:06:03,517 - INFO - ['程序员']
2019-02-13 23:06:03,517 - INFO - [8000]
2019-02-13 23:06:03,517 - INFO - [[1, '2019-1', '小c', '居住在西二旗', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:06:03,517 - INFO - 4
2019-02-13 23:06:03,518 - INFO - ['程序员']
2019-02-13 23:06:03,518 - INFO - [8000]
2019-02-13 23:06:03,518 - INFO - [[1, '2019-1', '小D', '居住在天通苑', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:07:02,875 - INFO - 4
2019-02-13 23:07:02,875 - INFO - ['程序员', '扫地']
2019-02-13 23:07:02,875 - INFO - [8000, 4000]
2019-02-13 23:07:02,875 - INFO - [[1, '2019-1', '小A', '住在回龙观', '程序员', 8000, '工资结算4周', 8000], [1, '2019-1', '小A', '住在回龙观', '扫地', 4000, '工资结算4周', 12000]]
2019-02-13 23:07:02,876 - INFO - 4
2019-02-13 23:07:02,876 - INFO - ['程序员']
2019-02-13 23:07:02,876 - INFO - [8000]
2019-02-13 23:07:02,876 - INFO - [[1, '2019-1', '小B', '居住在天通苑', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:07:02,876 - INFO - 4
2019-02-13 23:07:02,876 - INFO - ['程序员']
2019-02-13 23:07:02,876 - INFO - [8000]
2019-02-13 23:07:02,876 - INFO - [[1, '2019-1', '小c', '居住在西二旗', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:07:02,876 - INFO - 4
2019-02-13 23:07:02,876 - INFO - ['程序员']
2019-02-13 23:07:02,876 - INFO - [8000]
2019-02-13 23:07:02,877 - INFO - [[1, '2019-1', '小D', '居住在天通苑', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:12:41,720 - INFO - 4
2019-02-13 23:12:41,720 - INFO - ['程序员', '扫地']
2019-02-13 23:12:41,720 - INFO - [8000, 4000]
2019-02-13 23:12:41,720 - INFO - [[1, '2019-1', '小A', '住在回龙观', '程序员', 8000, '工资结算4周', 8000], [1, '2019-1', '小A', '住在回龙观', '扫地', 4000, '工资结算4周', 12000]]
2019-02-13 23:12:41,720 - INFO - 4
2019-02-13 23:12:41,721 - INFO - ['程序员']
2019-02-13 23:12:41,721 - INFO - [8000]
2019-02-13 23:12:41,721 - INFO - [[1, '2019-1', '小B', '居住在天通苑', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:12:41,721 - INFO - 4
2019-02-13 23:12:41,721 - INFO - ['程序员']
2019-02-13 23:12:41,721 - INFO - [8000]
2019-02-13 23:12:41,721 - INFO - [[1, '2019-1', '小c', '居住在西二旗', '程序员', 8000, '工资结算4周', 8000]]
2019-02-13 23:12:41,721 - INFO - 4
2019-02-13 23:12:41,721 - INFO - ['程序员']
2019-02-13 23:12:41,721 - INFO - [8000]
2019-02-13 23:12:41,721 - INFO - [[1, '2019-1', '小D', '居住在天通苑', '程序员', 8000, '工资结算4周', 8000]]
11-homework-yanjun/sql
0 → 100644
View file @
07ec68e2
这里有张 World 表
+-----------------+------------+------------+--------------+---------------+
| name | continent | area | population | gdp |
+-----------------+------------+------------+--------------+---------------+
| Afghanistan | Asia | 652230 | 25500100 | 20343000 |
| Albania | Europe | 28748 | 2831741 | 12960000 |
| Algeria | Africa | 2381741 | 37100000 | 188681000 |
| Andorra | Europe | 468 | 78115 | 3712000 |
| Angola | Africa | 1246700 | 20609294 | 100990000 |
+-----------------+------------+------------+--------------+---------------+
如果一个国家的面积超过300万平方公里,或者人口超过2500万,那么这个国家就是大国家。
编写一个SQL查询,输出表中所有大国家的名称、人口和面积。
例如,根据上表,我们应该输出:
+--------------+-------------+--------------+
| name | population | area |
+--------------+-------------+--------------+
| Afghanistan | 25500100 | 652230 |
| Algeria | 37100000 | 2381741 |
+--------------+-------------+--------------+
请写出SQL语句
select name, population, area from World where area > 3000000 or population > 25000000
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment