Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scheduling Paper #38

Merged
merged 103 commits into from
Oct 9, 2019
Merged

Scheduling Paper #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
6232121
Add paper parts and files
Express50 Jun 27, 2019
0b13159
Rewrite portions of introduction
Express50 Jul 5, 2019
8c384b1
Expand intro to describe our goals
Express50 Jul 5, 2019
595a683
Update paper.intro.tex
MishraSM Jul 9, 2019
333b708
Update paper pdf
Express50 Jul 9, 2019
0dc65a9
Work on problem section
Express50 Jul 11, 2019
692e715
Add math formulation subsection to problem
Express50 Jul 11, 2019
f8989f5
Add summary of constraints + more details
Express50 Jul 15, 2019
72e395e
Add more detailed descriptions to methods section
Express50 Jul 16, 2019
06bfa0b
Add all hard constraints to methods
Express50 Jul 17, 2019
a47f986
Add rough description of objective functions
Express50 Jul 17, 2019
528663e
Add details of weighted, normalized optimization
Express50 Jul 18, 2019
b6d142b
Clarify adjacency mapping from block to weekend
Express50 Jul 18, 2019
96d1ac2
Fix typos and clarify example
Express50 Jul 18, 2019
3a00f3f
SM edits to problem
MishraSM Jul 19, 2019
5d46a17
Update paper pdf
Express50 Jul 19, 2019
b280851
Minor fixes to problem, methods sections
Express50 Jul 19, 2019
f8abbbf
SM edits/comments Methods
MishraSM Jul 24, 2019
4f0e21e
Minor fix + update pdf
Express50 Jul 25, 2019
3d03a2c
Add very rough idea of results section w/table
Express50 Jul 29, 2019
1ed7f20
Add table for 2017 and comparison table
Express50 Jul 29, 2019
4680e28
Start simulations section
Express50 Jul 30, 2019
ac3127d
Add a few plots w/descriptions to results
Express50 Jul 30, 2019
2ce7443
Add section labels
Express50 Jul 30, 2019
7104ef4
Minor tweaks in results section
Express50 Jul 30, 2019
0e406e5
Fix past->present tense in results for consistency
Express50 Jul 30, 2019
35239ae
Add avg runtime for increasing # blocks plot
Express50 Aug 12, 2019
693f0ca
Add block-weekend adj comparison to results
Express50 Aug 12, 2019
2bb2f77
Clean up table & wording in results section
Express50 Aug 12, 2019
134ffe1
Fix minor typos in results
Express50 Aug 13, 2019
de270d5
Complete LP vs historical comparison
Express50 Aug 13, 2019
ece0659
Replace divisions graph with table
Express50 Aug 19, 2019
69f11cc
Remove "Plot of.." in figure captions
Express50 Aug 19, 2019
5b6a0b4
Change unsatisfied to satisfied requests in table
Express50 Aug 19, 2019
93ecbdf
Update division runtime table and rephrase
Express50 Aug 19, 2019
9fd3934
Remove 2017 table + use adjustbox to scale table
Express50 Aug 19, 2019
dd33d45
Fix runtime table + start discussion section
Express50 Aug 19, 2019
047c17e
Work on discussion: split into multiple paragraphs
Express50 Aug 19, 2019
07a55b9
Add future work paragraph to discussion
Express50 Aug 19, 2019
1ac0ef3
SM comments/edits to results
MishraSM Aug 21, 2019
a39d8a6
Rename divisions -> services throughout
Express50 Aug 21, 2019
b6a0222
Update runtimes in services table
Express50 Aug 22, 2019
8489b62
Minor fixes to wording in simulations
Express50 Aug 22, 2019
180fa07
Update plots and descriptions in results
Express50 Aug 23, 2019
fc5e42b
Add abstract
Express50 Aug 23, 2019
259e93f
SM edits abstract
MishraSM Aug 24, 2019
2191998
Work on intro and discussion sections
Express50 Aug 26, 2019
4a70e3e
Update paper pdf
Express50 Aug 26, 2019
4b41629
Work on intro + references
Express50 Aug 27, 2019
4cb0f7a
Work on discussion
Express50 Aug 27, 2019
0459143
Add preliminary title + author/affil list
Express50 Aug 29, 2019
b12e18d
Clean up abstract, intro, problem, methods, results
Express50 Aug 29, 2019
4e6f2e7
Work on discussion
Express50 Aug 29, 2019
da0f7b2
SM edits affiliations
MishraSM Aug 29, 2019
6c7d559
SM edits/comments discussion
MishraSM Aug 29, 2019
5e956f6
Add acks + funding sections
Express50 Aug 30, 2019
5e404e1
Fix up references
Express50 Aug 30, 2019
4ae9c69
Work on fixing discussion
Express50 Aug 30, 2019
5040434
Add CPU/RAM specs + fix up discussion
Express50 Sep 4, 2019
d7bd187
Minor typo and other fixes
Express50 Sep 4, 2019
1a2b07d
Clarify comparison table
Express50 Sep 4, 2019
38549bd
Add hard line breaks for easier editing
Express50 Sep 7, 2019
e78950b
Fix most chktex warnings
Express50 Sep 7, 2019
9babdc5
circumvent bbm install issues
jessexknight Sep 13, 2019
f078a97
paragraph spacing
jessexknight Sep 13, 2019
c53f39f
tables & figures cleanup
jessexknight Sep 13, 2019
1a87abc
intro edits
jessexknight Sep 13, 2019
1835b12
editing problem
jessexknight Sep 14, 2019
ba44ba5
one last note on problem
jessexknight Sep 14, 2019
d86a3c6
editing methods
jessexknight Sep 15, 2019
11624a1
editing results
jessexknight Sep 15, 2019
5d8b41e
editing discussion
jessexknight Sep 15, 2019
ec7736d
Merge includes + definitions
Express50 Sep 16, 2019
84b07a1
Fix intro
Express50 Sep 16, 2019
73a3266
Fix problem
Express50 Sep 16, 2019
ca665e3
Remove unnecessary detail in problem
Express50 Sep 16, 2019
eb773f1
Clarify experiments in intro
Express50 Sep 16, 2019
d043e69
Fix methods section
Express50 Sep 16, 2019
bfd00bb
Start fixing results (experiments) section
Express50 Sep 17, 2019
44c0de5
Minor fix to discussion
Express50 Sep 17, 2019
2754fff
Work on methods fixes
Express50 Sep 19, 2019
3a06270
Weaken statement about other approaches
Express50 Sep 19, 2019
2eb5fd7
Add a few other corrections
Express50 Sep 24, 2019
78328f8
Clarify Branch-and-Cut relaxations
Express50 Oct 3, 2019
61ab4f9
Replace figures in experiments section
Express50 Oct 3, 2019
35fc793
Remove old scheduler pdf
Express50 Oct 4, 2019
0844716
Add configs + requests to replicate paper results
Express50 Oct 4, 2019
bd5e120
Remove sentence about services in hospital depts
Express50 Oct 4, 2019
d80b8b6
Minor fixes
Express50 Oct 8, 2019
37afa31
Update paper.abstract.tex
MishraSM Oct 9, 2019
fc91d4b
Update paper.acknowledgements.tex
MishraSM Oct 9, 2019
81b5ef7
Update paper.funding.tex
MishraSM Oct 9, 2019
86759de
Update paper.intro.tex
MishraSM Oct 9, 2019
997a01e
Update paper.problem.tex
MishraSM Oct 9, 2019
dc4236a
Minor fixes in abstract/acks/experiments
Express50 Oct 9, 2019
bafc358
Update paper.methods.tex
MishraSM Oct 9, 2019
745945b
Merge branch 'paper' of https://github.com/c-uhs/scheduler into paper
MishraSM Oct 9, 2019
3e7c2c5
Update paper.experiments.tex
MishraSM Oct 9, 2019
f9098b6
Update paper.experiments.tex
MishraSM Oct 9, 2019
64e372d
Update paper.discussion.tex
MishraSM Oct 9, 2019
4a74a70
Use numbers in eqn labels in methods
Express50 Oct 9, 2019
9cc597b
Minor fixes in experiments section
Express50 Oct 9, 2019
43d00cf
Update pdf
Express50 Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ src/token.json
*.aux
*.out
*.synctex.gz
*.fdb_latexmk
*.fls
*.bbl
*.blg

##########
# SPHINX #
Expand Down Expand Up @@ -169,4 +173,4 @@ docs/build/doctrees

# ignore cbc files
!scripts/
scripts/cbc*
scripts/cbc*
104 changes: 104 additions & 0 deletions paper/data/configs/2015_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{
"B": {
"name": "B",
"email": "",
"divisions": {
"HIV": {
"min": 9,
"max": 10
},
"ID": {
"min": 3,
"max": 4
}
}
},
"A": {
"name": "A",
"email": "",
"divisions": {
"HIV": {
"min": 11,
"max": 12
}
}
},
"E": {
"name": "E",
"email": "",
"divisions": {
"ID": {
"min": 2,
"max": 3
}
}
},
"F": {
"name": "F",
"email": "",
"divisions": {
"ID": {
"min": 4,
"max": 5
}
}
},
"D": {
"name": "D",
"email": "",
"divisions": {
"ID": {
"min": 3,
"max": 4
},
"HIV": {
"min": 2,
"max": 3
}
}
},
"C": {
"name": "C",
"email": "",
"divisions": {
"ID": {
"min": 3,
"max": 4
},
"HIV": {
"min": 2,
"max": 3
}
}
},
"G": {
"name": "G",
"email": "",
"divisions": {
"ID": {
"min": 3,
"max": 4
}
}
},
"H": {
"name": "H",
"email": "",
"divisions": {
"ID": {
"min": 4,
"max": 5
}
}
},
"I": {
"name": "I",
"email": "",
"divisions": {
"ID": {
"min": 3,
"max": 4
}
}
}
}
114 changes: 114 additions & 0 deletions paper/data/configs/2016_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
{
"F": {
"name": "F",
"email": "",
"divisions": {
"ID": {
"min": 4,
"max": 5
}
}
},
"I": {
"name": "I",
"email": "",
"divisions": {
"ID": {
"min": 4,
"max": 5
}
}
},
"G": {
"name": "G",
"email": "",
"divisions": {
"ID": {
"min": 2,
"max": 3
}
}
},
"E": {
"name": "E",
"email": "",
"divisions": {
"ID": {
"min": 3,
"max": 4
}
}
},
"B": {
"name": "B",
"email": "",
"divisions": {
"HIV": {
"min": 9,
"max": 10
},
"ID": {
"min": 3,
"max": 4
}
}
},
"A": {
"name": "A",
"email": "",
"divisions": {
"HIV": {
"min": 11,
"max": 12
}
}
},
"D": {
"name": "D",
"email": "",
"divisions": {
"ID": {
"min": 2,
"max": 3
},
"HIV": {
"min": 2,
"max": 3
}
}
},
"H": {
"name": "H",
"email": "",
"divisions": {
"ID": {
"min": 4,
"max": 5
}
}
},
"C": {
"name": "C",
"email": "",
"divisions": {
"ID": {
"min": 3,
"max": 4
},
"HIV": {
"min": 2,
"max": 3
}
}
},
"J": {
"name": "J",
"email": "",
"divisions": {
"HIV": {
"min": 1,
"max": 2
}
}
}
}
114 changes: 114 additions & 0 deletions paper/data/configs/2017_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
{
"B": {
"name": "B",
"email": "",
"divisions": {
"HIV": {
"min": 8,
"max": 9
},
"ID": {
"min": 2,
"max": 3
}
}
},
"A": {
"name": "A",
"email": "",
"divisions": {
"HIV": {
"min": 8,
"max": 9
}
}
},
"E": {
"name": "E",
"email": "",
"divisions": {
"ID": {
"min": 4,
"max": 5
}
}
},
"G": {
"name": "G",
"email": "",
"divisions": {
"ID": {
"min": 3,
"max": 4
}
}
},
"I": {
"name": "I",
"email": "",
"divisions": {
"ID": {
"min": 3,
"max": 4
}
}
},
"F": {
"name": "F",
"email": "",
"divisions": {
"ID": {
"min": 4,
"max": 5
}
}
},
"D": {
"name": "D",
"email": "",
"divisions": {
"ID": {
"min": 2,
"max": 3
},
"HIV": {
"min": 3,
"max": 4
}
}
},
"J": {
"name": "J",
"email": "",
"divisions": {
"HIV": {
"min": 3,
"max": 4
}
}
},
"H": {
"name": "H",
"email": "",
"divisions": {
"ID": {
"min": 4,
"max": 5
}
}
},
"C": {
"name": "C",
"email": "",
"divisions": {
"ID": {
"min": 3,
"max": 4
},
"HIV": {
"min": 3,
"max": 4
}
}
}
}
Loading