W13
This commit is contained in:
		
							parent
							
								
									fae35f1ebf
								
							
						
					
					
						commit
						7cb96051a3
					
				
							
								
								
									
										105
									
								
								config.yaml
									
									
									
									
									
								
							
							
						
						
									
										105
									
								
								config.yaml
									
									
									
									
									
								
							@ -1,5 +1,5 @@
 | 
				
			|||||||
config:
 | 
					config:
 | 
				
			||||||
  days: 4
 | 
					  days: 3
 | 
				
			||||||
  weights:
 | 
					  weights:
 | 
				
			||||||
    likes: 1
 | 
					    likes: 1
 | 
				
			||||||
    hates: 3
 | 
					    hates: 3
 | 
				
			||||||
@ -8,99 +8,98 @@ config:
 | 
				
			|||||||
  task_re: "[ ,/]+"
 | 
					  task_re: "[ ,/]+"
 | 
				
			||||||
tasks:
 | 
					tasks:
 | 
				
			||||||
  hotemetoten:
 | 
					  hotemetoten:
 | 
				
			||||||
    personen: [Lucus, Yorick, Sjors, MacGyver, Linda, Wassasin]
 | 
					    personen: [MrNGm, Pepper, Joost, Annelies]
 | 
				
			||||||
    workload: 4
 | 
					    workload: 4
 | 
				
			||||||
    req: [1, 1, 1, 1]
 | 
					    req: [1, 1, 1]
 | 
				
			||||||
    hardcode:
 | 
					    hardcode:
 | 
				
			||||||
      - Wassasin
 | 
					      - MrNGm
 | 
				
			||||||
      - lucus
 | 
					#      - Pepper
 | 
				
			||||||
      - Yorick
 | 
					      - Joost
 | 
				
			||||||
      - Sjors
 | 
					      - Annelies
 | 
				
			||||||
    lookup: [hotemetoten]
 | 
					    lookup: [hotemetoten]
 | 
				
			||||||
  superkok:
 | 
					  superkok:
 | 
				
			||||||
    req: [1, 1, 1, 1]
 | 
					    req: [1, 1, 1]
 | 
				
			||||||
    personen: [linda, pepper, bwesterb, tommeh]
 | 
					    personen: [lynn, pepper, Wassasin]
 | 
				
			||||||
    workload: 4
 | 
					    workload: 4
 | 
				
			||||||
    lookup: [superkok]
 | 
					    lookup: [superkok]
 | 
				
			||||||
    hardcode:
 | 
					    hardcode:
 | 
				
			||||||
      - Linda
 | 
					 | 
				
			||||||
      - Pepper
 | 
					      - Pepper
 | 
				
			||||||
      - bwesterb
 | 
					      - Wassasin
 | 
				
			||||||
      - tommeh
 | 
					      - lynn
 | 
				
			||||||
  drankmanagen:
 | 
					  drankmanagen:
 | 
				
			||||||
    req: [1, 1, 1, 1]
 | 
					    req: [1, 1, 1]
 | 
				
			||||||
    personen: [MacGyver]
 | 
					    personen: [MacGyver]
 | 
				
			||||||
    workload: 1
 | 
					    workload: 1
 | 
				
			||||||
    lookup: [drankmanagen]
 | 
					    lookup: [drankmanagen]
 | 
				
			||||||
  koken:
 | 
					  koken:
 | 
				
			||||||
    req: [3, 2, 2, 2]
 | 
					    req: [2, 3, 2]
 | 
				
			||||||
    workload: 3
 | 
					    workload: 3
 | 
				
			||||||
    personen: liefhebbers
 | 
					    personen: liefhebbers
 | 
				
			||||||
    lookup: [koken, kookhulp, hulpkoken]
 | 
					    lookup: [koken, kookhulp, hulpkoken]
 | 
				
			||||||
  schoonmaken:
 | 
					  schoonmaken:
 | 
				
			||||||
    req: [3, 4, 4, 4]
 | 
					    req: [3, 4, 4]
 | 
				
			||||||
    workload: 2
 | 
					    workload: 2
 | 
				
			||||||
    personen: iedereen
 | 
					    personen: iedereen
 | 
				
			||||||
    lookup: [schoonmaken]
 | 
					    lookup: [schoonmaken]
 | 
				
			||||||
  snackdealen:
 | 
					  snackdealen:
 | 
				
			||||||
    req: [4, 5, 5, 5]
 | 
					    req: [4, 5, 5]
 | 
				
			||||||
    workload: 1
 | 
					    workload: 1
 | 
				
			||||||
    personen: iedereen
 | 
					    personen: iedereen
 | 
				
			||||||
    lookup: [hapjes, snackdealen]
 | 
					    lookup: [hapjes, snackdealen]
 | 
				
			||||||
  fotograferen:
 | 
					  fotograferen:
 | 
				
			||||||
    req: [2, 2, 2, 2]
 | 
					    req: [2, 2, 2]
 | 
				
			||||||
    workload: 1
 | 
					    workload: 1
 | 
				
			||||||
    personen: liefhebbers
 | 
					    personen: liefhebbers
 | 
				
			||||||
    lookup: [fotograferen]
 | 
					    lookup: [fotograferen]
 | 
				
			||||||
  afwassen:
 | 
					  afwassen:
 | 
				
			||||||
    req: [4, 4, 4, 4]
 | 
					    req: [4, 4, 4]
 | 
				
			||||||
    workload: 2
 | 
					    workload: 2
 | 
				
			||||||
    personen: iedereen
 | 
					    personen: iedereen
 | 
				
			||||||
    lookup: [afwassen]
 | 
					    lookup: [afwassen]
 | 
				
			||||||
  snijpieten:
 | 
					  snijpieten:
 | 
				
			||||||
    req: [3, 4, 4, 4]
 | 
					    req: [3, 4, 4]
 | 
				
			||||||
    workload: 2
 | 
					    workload: 2
 | 
				
			||||||
    personen: iedereen
 | 
					    personen: iedereen
 | 
				
			||||||
    lookup: [snijden]
 | 
					    lookup: [snijden]
 | 
				
			||||||
 | 
					  pendelen:
 | 
				
			||||||
 | 
					    req: [2, 1, 2]
 | 
				
			||||||
 | 
					    workload: 2
 | 
				
			||||||
 | 
					    personen: liefhebbers
 | 
				
			||||||
 | 
					    lookup: [pendelen]
 | 
				
			||||||
people:
 | 
					people:
 | 
				
			||||||
- Lucus
 | 
					 | 
				
			||||||
- Yorick
 | 
					 | 
				
			||||||
- Sjors
 | 
					 | 
				
			||||||
- MacGyver
 | 
					 | 
				
			||||||
- Linda
 | 
					 | 
				
			||||||
- Wassasin
 | 
					 | 
				
			||||||
- Daan
 | 
					 | 
				
			||||||
- MrNGm
 | 
					 | 
				
			||||||
- Petervdv
 | 
					 | 
				
			||||||
- Minnozz
 | 
					 | 
				
			||||||
- Nova
 | 
					 | 
				
			||||||
- Joost
 | 
					 | 
				
			||||||
- Obfusk:
 | 
					 | 
				
			||||||
    dagen: []
 | 
					 | 
				
			||||||
- Marlon
 | 
					 | 
				
			||||||
- Pepper
 | 
					- Pepper
 | 
				
			||||||
- PaxSum: # vrijdag
 | 
					- Joost
 | 
				
			||||||
    dagen: [1,2,3]
 | 
					- MrNGm
 | 
				
			||||||
- M-ou-se
 | 
					 | 
				
			||||||
- Annelies
 | 
					- Annelies
 | 
				
			||||||
- Weasel
 | 
					- Wassasin
 | 
				
			||||||
- Carrot
 | 
					- lynn
 | 
				
			||||||
- Roflincopter
 | 
					- Roflincopter
 | 
				
			||||||
- Bwesterb
 | 
					- lucus
 | 
				
			||||||
- Tommeh: # vrijdag
 | 
					- Weasel
 | 
				
			||||||
    dagen: [1,2,3]
 | 
					 | 
				
			||||||
- NickNick
 | 
					 | 
				
			||||||
- Quis
 | 
					 | 
				
			||||||
- SyntaxTerror
 | 
					 | 
				
			||||||
- ElizaAntoine
 | 
					- ElizaAntoine
 | 
				
			||||||
 | 
					- Lyra
 | 
				
			||||||
 | 
					- MacGyver
 | 
				
			||||||
- Abel
 | 
					- Abel
 | 
				
			||||||
- Carlien
 | 
					- SyntaxTerror
 | 
				
			||||||
 | 
					- carrot
 | 
				
			||||||
- Blondie
 | 
					- Blondie
 | 
				
			||||||
- Avel: # vrijdag
 | 
					- Bwesterb
 | 
				
			||||||
    dagen: [1,2,3]
 | 
					- M-ou-se
 | 
				
			||||||
- Thundur: # vrijdag
 | 
					- PaxSum
 | 
				
			||||||
    dagen: [1,2,3]
 | 
					- Petervdv
 | 
				
			||||||
- Ayke
 | 
					- Margot
 | 
				
			||||||
 | 
					- Daan
 | 
				
			||||||
 | 
					- Laurens
 | 
				
			||||||
 | 
					- yorick
 | 
				
			||||||
 | 
					- Minnozz
 | 
				
			||||||
 | 
					- Sjors
 | 
				
			||||||
 | 
					- Quis
 | 
				
			||||||
 | 
					- Nova
 | 
				
			||||||
 | 
					- Marlon
 | 
				
			||||||
 | 
					- Aaron
 | 
				
			||||||
 | 
					- AlphaCentauri
 | 
				
			||||||
 | 
					- BOBMarlie
 | 
				
			||||||
 | 
					- Martijn
 | 
				
			||||||
 | 
					- Colin
 | 
				
			||||||
 | 
					- Blu
 | 
				
			||||||
- Hannah
 | 
					- Hannah
 | 
				
			||||||
- Cocidius:
 | 
					 | 
				
			||||||
    dagen: [1,2,3]
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -148,7 +148,9 @@ def write_tasks(people, tasks, file=sys.stdout):
 | 
				
			|||||||
        for (d,t) in p.does:
 | 
					        for (d,t) in p.does:
 | 
				
			||||||
            days[d].append((t, t in p.loves, t in p.hates))
 | 
					            days[d].append((t, t in p.loves, t in p.hates))
 | 
				
			||||||
        q = lambda w: ",".join([t + (" <3" if l else "") + (" :(" if h else "") for (t,l,h) in w])
 | 
					        q = lambda w: ",".join([t + (" <3" if l else "") + (" :(" if h else "") for (t,l,h) in w])
 | 
				
			||||||
        print("| {} || {} || {} || {} || {} || {} || {}".format(name, *map(q, days), p.vrolijkheid(), p.workload(tasks)), file=file)
 | 
					        days_fmt = " {} ||" * len(days)
 | 
				
			||||||
 | 
					        days_filled = days_fmt.format(*map(q, days))
 | 
				
			||||||
 | 
					        print("| {} ||{} {} || {}".format(name, days_filled, p.vrolijkheid(), p.workload(tasks)), file=file)
 | 
				
			||||||
        print("|-")
 | 
					        print("|-")
 | 
				
			||||||
people = read_people(conf['people'])
 | 
					people = read_people(conf['people'])
 | 
				
			||||||
with open('prefs_table', 'r') as pref_file:
 | 
					with open('prefs_table', 'r') as pref_file:
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										62
									
								
								prefs_table
									
									
									
									
									
								
							
							
						
						
									
										62
									
								
								prefs_table
									
									
									
									
									
								
							@ -1,31 +1,31 @@
 | 
				
			|||||||
Lucus 	koken 	schoonmaken, fotograferen
 | 
					Pepper 	koken, snijden 	fotograferen, snackdealen
 | 
				
			||||||
Wassasin 	koken 	fotograferen
 | 
					Joost 	afwassen, koken, snijden 	fotograferen, snackdealen
 | 
				
			||||||
linda 	superkok 	koken, snijden, afwassen, schoonmaken, fotograferen
 | 
					Annelies 	afwassen, fotograferen, pendelen 	koken, snijden, snackdealen
 | 
				
			||||||
Nova 	koken, afwassen 	fotograferen, snackdealen
 | 
					Laurens 	pendelen, koken, snijden 	schoonmaken
 | 
				
			||||||
Obfusk 	koken, afwassen 	fotograferen, snackdealen, schoonmaken
 | 
					Weasel 	fotograferen, koken, snijden 	snackdealen, schoonmaken
 | 
				
			||||||
Daan 	fotograferen, koken 	schoonmaken
 | 
					Martijn 	koken, snijden 	schoonmaken, afwassen
 | 
				
			||||||
Pepper 	superkok 	
 | 
					PaxSum 	koken, snijden, afwassen 	fotograferen, snackdealen
 | 
				
			||||||
Roflincopter 	snijden, afwassen, schoonmaken 	snackdealen, fotograferen, koken
 | 
					petervdv 	snackdealen, pendelen 	koken, afwassen, schoonmaken, fotograferen
 | 
				
			||||||
SyntaxTerror 	fotograferen, snijden, afwassen 	koken
 | 
					Lyra 	fotograferen, afwassen, snijden 	pendelen
 | 
				
			||||||
Annelies 	fotograferen, afwassen, koken 	snackdealen
 | 
					Nova 	pendelen, koken, snijden 	fotograferen, schoonmaken, snackdealen
 | 
				
			||||||
Joost 	snijden, koken, afwassen 	fotograferen, snackdealen
 | 
					ElizaAntoine 	afwassen, schoonmaken, fotograferen 	koken, snijden, snackdealen, pendelen
 | 
				
			||||||
MrNGm 	koken, snijden, schoonmaken, fotograferen 	
 | 
					SyntaxTerror 	fotograferen, snijden, afwassen 	koken, snackdealen, pendelen
 | 
				
			||||||
PaxSum 	koken, snijden, afwassen 	Fotograferen, snackdealen
 | 
					AlphaCentauri 	snackdealen, schoonmaken, afwassen 	koken, pendelen, snijden
 | 
				
			||||||
Weasel 	hulpkoken, snijden, fotograferen 	snackdealen, schoonmaken
 | 
					Daan 	pendelen, fotograferen 	afwassen, schoonmaken
 | 
				
			||||||
NickNick 	snackdealen, snijden, koken 	schoonmaken, afwassen
 | 
					Lucus 	koken, snijden, afwassen 	fotograferen, schoonmaken
 | 
				
			||||||
carrot 	snijden, koken, afwassen 	schoonmaken, snackdealen
 | 
					Abel 	fotograferen, snijden, afwassen 	schoonmaken, koken
 | 
				
			||||||
bwesterb 	superkok, snijden 	schoonmaken, snackdealen, afwassen
 | 
					yorick 	snijden, afwassen 	fotograferen, schoonmaken
 | 
				
			||||||
Minnozz 	koken 	schoonmaken
 | 
					bwesterb 	snijden, koken 	afwassen, schoonmaken, snackdealen
 | 
				
			||||||
ElizaAntoine 	snijden, schoonmaken, afwassen 	snackdealen, koken
 | 
					Quis 	snijden, koken, snackdealen 	schoonmaken
 | 
				
			||||||
Ayke 	koken, snijden, afwassen 	
 | 
					Minnozz 	snijden, koken 	schoonmaken, snackdealen, afwassen
 | 
				
			||||||
Cocidius 	koken, snijden, afwassen 	schoonmaken
 | 
					Margot 	snijden, koken, afwassen 	schoonmaken, snackdealen, fotograferen
 | 
				
			||||||
Blondie 	fotograferen, koken 	schoonmaken, snackdealen
 | 
					lynn 		fotograferen
 | 
				
			||||||
Thundur 	snijden, koken, afwassen 	snackdealen, fotograferen
 | 
					Colin 	Afwassen, schoonmaken, snackdealen 	koken, snijden
 | 
				
			||||||
Tommeh 	superkok 	
 | 
					Sjors 	Pendelen, schoonmaken, snackdealen 	koken, snijden
 | 
				
			||||||
Petervdv 	snackdealen 	fotograferen, koken, afwassen
 | 
					Blondie 	fotograferen, afwassen, snackdealen 	schoonmaken, snijden
 | 
				
			||||||
Abel 	fotograferen, afwassen 	
 | 
					Roflincopter 	schoonmaken, snijden, afwassen 	snackdealen, fotograferen
 | 
				
			||||||
Avel 	fotograferen, schoonmaken, snackdealen 	snijden, afwassen
 | 
					BOBMarlie 	fotograferen, koken, snijden 	afwassen, schoonmaken, snackdealen
 | 
				
			||||||
Sjors 	snackdealen, schoonmaken 	koken
 | 
					Aaron 	fotograferen, afwassen, snijden 	koken, schoonmaken, snackdealen, pendelen
 | 
				
			||||||
Carlien 	snackdealen, schoonmaken 	koken
 | 
					Wassasin 	koken, snijden, snackdealen 	fotograferen
 | 
				
			||||||
Quis 	snackdealen, snijden, koken 	schoonmaken, fotograferen 
 | 
					carrot 	pendelen, schoonmaken, koken 	fotograferen, snackdealen
 | 
				
			||||||
MacGyver  	drankmanagen	  
 | 
					M-ou-se 	snijden, snackdealen 	afwassen, schoonmaken, fotograferen 
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user