W15
This commit is contained in:
Margot Sauter
parent
7cb96051a3
commit
8ff6ffa559
114
config.yaml
114
config.yaml
@ -8,98 +8,92 @@ config:
|
||||
task_re: "[ ,/]+"
|
||||
tasks:
|
||||
hotemetoten:
|
||||
personen: [MrNGm, Pepper, Joost, Annelies]
|
||||
personen: [Lyra, mrngm, Quis]
|
||||
workload: 4
|
||||
req: [1, 1, 1]
|
||||
hardcode:
|
||||
- MrNGm
|
||||
# - Pepper
|
||||
- Joost
|
||||
- Annelies
|
||||
- Lyra
|
||||
- mrngm
|
||||
- Quis
|
||||
lookup: [hotemetoten]
|
||||
superkok:
|
||||
req: [1, 1, 1]
|
||||
personen: [lynn, pepper, Wassasin]
|
||||
personen: [MacGyver, Loki, Pepper]
|
||||
workload: 4
|
||||
lookup: [superkok]
|
||||
hardcode:
|
||||
- MacGyver
|
||||
- Loki
|
||||
- Pepper
|
||||
- Wassasin
|
||||
- lynn
|
||||
drankmanagen:
|
||||
req: [1, 1, 1]
|
||||
personen: [MacGyver]
|
||||
workload: 1
|
||||
lookup: [drankmanagen]
|
||||
snijden:
|
||||
req: [2, 5, 3]
|
||||
workload: 2
|
||||
personen: iedereen
|
||||
lookup: [snijden]
|
||||
koken:
|
||||
req: [2, 3, 2]
|
||||
workload: 3
|
||||
personen: liefhebbers
|
||||
lookup: [koken, kookhulp, hulpkoken]
|
||||
afwassen:
|
||||
req: [3, 6, 6]
|
||||
workload: 2
|
||||
personen: iedereen
|
||||
lookup: [afwassen]
|
||||
schoonmaken:
|
||||
req: [3, 4, 4]
|
||||
req: [2, 4, 4]
|
||||
workload: 2
|
||||
personen: iedereen
|
||||
lookup: [schoonmaken]
|
||||
snackdealen:
|
||||
req: [4, 5, 5]
|
||||
req: [2, 4, 4]
|
||||
workload: 1
|
||||
personen: iedereen
|
||||
lookup: [hapjes, snackdealen]
|
||||
fotograferen:
|
||||
req: [2, 2, 2]
|
||||
req: [2, 3, 3]
|
||||
workload: 1
|
||||
personen: liefhebbers
|
||||
lookup: [fotograferen]
|
||||
afwassen:
|
||||
req: [4, 4, 4]
|
||||
workload: 2
|
||||
personen: iedereen
|
||||
lookup: [afwassen]
|
||||
snijpieten:
|
||||
req: [3, 4, 4]
|
||||
workload: 2
|
||||
personen: iedereen
|
||||
lookup: [snijden]
|
||||
pendelen:
|
||||
req: [2, 1, 2]
|
||||
req: [1, 1, 1]
|
||||
workload: 2
|
||||
personen: liefhebbers
|
||||
lookup: [pendelen]
|
||||
people:
|
||||
- Pepper
|
||||
- Joost
|
||||
- MrNGm
|
||||
- Annelies
|
||||
- Wassasin
|
||||
- lynn
|
||||
- Roflincopter
|
||||
- lucus
|
||||
- Weasel
|
||||
- ElizaAntoine
|
||||
- Lyra
|
||||
- MacGyver
|
||||
- Abel
|
||||
- SyntaxTerror
|
||||
- carrot
|
||||
- Blondie
|
||||
- Bwesterb
|
||||
- M-ou-se
|
||||
- PaxSum
|
||||
- Petervdv
|
||||
- Margot
|
||||
- Daan
|
||||
- Laurens
|
||||
- yorick
|
||||
- Minnozz
|
||||
- Sjors
|
||||
- mrngm
|
||||
- Quis
|
||||
- Nova
|
||||
- MacGyver
|
||||
- Loki
|
||||
- Pepper
|
||||
- Abel
|
||||
- Alexandra
|
||||
- Annelies
|
||||
- Annemiek: # niet op zondag
|
||||
dagen: [0,1]
|
||||
- avel
|
||||
- Ayke
|
||||
- blu
|
||||
- carrot
|
||||
- eliza
|
||||
- Farnaz
|
||||
- Harm
|
||||
- Joost
|
||||
- Leonie
|
||||
- lucus
|
||||
- Margot
|
||||
- Marley
|
||||
- Marlon
|
||||
- Aaron
|
||||
- AlphaCentauri
|
||||
- BOBMarlie
|
||||
- Martijn
|
||||
- Colin
|
||||
- Blu
|
||||
- Hannah
|
||||
- Minnozz
|
||||
- Nova
|
||||
- PaxSum
|
||||
- petervdv
|
||||
- phedny
|
||||
- PP
|
||||
- Rian
|
||||
- Sjors
|
||||
- SyntaxTerror
|
||||
- Tanja
|
||||
- Thom
|
||||
- yorick
|
||||
|
||||
@ -6,7 +6,7 @@ import re
|
||||
import subprocess
|
||||
from collections import OrderedDict
|
||||
import glpm
|
||||
conf = yaml.load(open('config.yaml', 'r'))
|
||||
conf = yaml.safe_load(open('config.yaml', 'r'))
|
||||
config = conf['config']
|
||||
config['ignore'].append('')
|
||||
tasks = OrderedDict(conf['tasks'])
|
||||
|
||||
@ -18,7 +18,6 @@ set D := 1..D_count;
|
||||
/* aanwezigheid x workload for that day */
|
||||
param Costs{p in P}, integer, >= 0;
|
||||
|
||||
|
||||
/* Person p likes to solve jobs j */
|
||||
param L{p in P, j in J} default 0, binary;
|
||||
|
||||
@ -53,7 +52,7 @@ s.t. max_load_person{p in P, d in D}: sum{j in J} A[p,j,d] <= max_load[p,d];
|
||||
#s.t. min_load_person{p in P}: sum{j in J, d in D} A[p,j,d] >= min_load[p];
|
||||
|
||||
/* A person does not perform the same job on all days */
|
||||
/*s.t. duplicate_jobs{p in P, j in J}: sum{d in D} A[p,j,d] <= D_count-1;*/
|
||||
s.t. duplicate_jobs{p in P, j in J}: sum{d in D} A[p,j,d] <= D_count-1;
|
||||
|
||||
s.t. max_load_person_total{p in P}: (sum{d in D, j in J} A[p,j,d] * Wl[j]) <= ML;
|
||||
|
||||
|
||||
59
prefs_table
59
prefs_table
@ -1,31 +1,28 @@
|
||||
Pepper koken, snijden fotograferen, snackdealen
|
||||
Joost afwassen, koken, snijden fotograferen, snackdealen
|
||||
Annelies afwassen, fotograferen, pendelen koken, snijden, snackdealen
|
||||
Laurens pendelen, koken, snijden schoonmaken
|
||||
Weasel fotograferen, koken, snijden snackdealen, schoonmaken
|
||||
Martijn koken, snijden schoonmaken, afwassen
|
||||
PaxSum koken, snijden, afwassen fotograferen, snackdealen
|
||||
petervdv snackdealen, pendelen koken, afwassen, schoonmaken, fotograferen
|
||||
Lyra fotograferen, afwassen, snijden pendelen
|
||||
Nova pendelen, koken, snijden fotograferen, schoonmaken, snackdealen
|
||||
ElizaAntoine afwassen, schoonmaken, fotograferen koken, snijden, snackdealen, pendelen
|
||||
SyntaxTerror fotograferen, snijden, afwassen koken, snackdealen, pendelen
|
||||
AlphaCentauri snackdealen, schoonmaken, afwassen koken, pendelen, snijden
|
||||
Daan pendelen, fotograferen afwassen, schoonmaken
|
||||
Lucus koken, snijden, afwassen fotograferen, schoonmaken
|
||||
Abel fotograferen, snijden, afwassen schoonmaken, koken
|
||||
yorick snijden, afwassen fotograferen, schoonmaken
|
||||
bwesterb snijden, koken afwassen, schoonmaken, snackdealen
|
||||
Quis snijden, koken, snackdealen schoonmaken
|
||||
Minnozz snijden, koken schoonmaken, snackdealen, afwassen
|
||||
Margot snijden, koken, afwassen schoonmaken, snackdealen, fotograferen
|
||||
lynn fotograferen
|
||||
Colin Afwassen, schoonmaken, snackdealen koken, snijden
|
||||
Sjors Pendelen, schoonmaken, snackdealen koken, snijden
|
||||
Blondie fotograferen, afwassen, snackdealen schoonmaken, snijden
|
||||
Roflincopter schoonmaken, snijden, afwassen snackdealen, fotograferen
|
||||
BOBMarlie fotograferen, koken, snijden afwassen, schoonmaken, snackdealen
|
||||
Aaron fotograferen, afwassen, snijden koken, schoonmaken, snackdealen, pendelen
|
||||
Wassasin koken, snijden, snackdealen fotograferen
|
||||
carrot pendelen, schoonmaken, koken fotograferen, snackdealen
|
||||
M-ou-se snijden, snackdealen afwassen, schoonmaken, fotograferen
|
||||
Abel fotograferen, afwassen, snijden pendelen, koken
|
||||
Alexandra snijden, snackdealen afwassen, schoonmaken
|
||||
Annelies afwassen, fotograferen snackdealen
|
||||
Annemiek schoonmaken, koken pendelen, afwassen
|
||||
avel snackdealen snijden, koken, afwassen
|
||||
blu snijden, snackdealen, pendelen afwassen, schoonmaken
|
||||
carrot koken, snijden fotograferen, schoonmaken
|
||||
eliza snijden, afwassen koken, snackdealen, pendelen
|
||||
Farnaz snijden, koken, snackdealen pendelen, afwassen, fotograferen
|
||||
Harm fotograferen, pendelen, afwassen schoonmaken, snackdealen
|
||||
Joost snijden fotograferen, pendelen, koken, afwassen, schoonmaken, koken
|
||||
Leonie snijden, pendelen, snackdealen fotograferen, schoonmaken
|
||||
lucus snijden, koken, afwassen schoonmaken
|
||||
Margot snijden, afwassen, fotograferen koken, snackdealen, schoonmaken
|
||||
Marley snijden, afwassen fotograferen, snackdealen
|
||||
Marlon snijden, koken, snackdealen afwassen, schoonmaken
|
||||
Minnozz fotograferen, snijden koken, afwassen, schoonmaken, pendelen, snackdealen
|
||||
Nova koken, snijden, pendelen fotograferen, schoonmaken
|
||||
PaxSum koken, snijden schoonmaken, afwassen
|
||||
petervdv snackdealen, pendelen koken, afwassen, fotograferen
|
||||
phedny snijden, snackdealen afwassen, schoonmaken
|
||||
PP koken, snijden pendelen, fotograferen, schoonmaken
|
||||
Rian snijden, afwassen, snackdealen fotograferen, pendelen
|
||||
Sjors snackdealen, pendelen schoonmaken
|
||||
SyntaxTerror fotograferen pendelen, koken, snackdealen
|
||||
Tanja snijden, afwassen, schoonmaken fotograferen, pendelen
|
||||
Thom koken, snijden, afwassen fotograferen, snackdealen
|
||||
yorick koken, snijden, afwassen fotograferen
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user