Weekend 22, some QoL improvements (added wiki_to_prefs_table.py, print wiki header in output as well)

config.yaml

@@ -1,5 +1,5 @@
 config:
-  days: 3
+  days: 4
   weights:
     likes: 1
     hates: 3
@@ -8,95 +8,98 @@ config:
   task_re: "[ ,/]+"
 tasks:
   hotemetoten:
-    personen: [Lyra, mrngm, Pepper]
+    personen: [Tanja, mrngm, MargotM, Eliza]
     workload: 4
-    req: [1, 1, 1]
+    req: [1, 1, 1, 1]
     hardcode:
-      - Lyra
+      - Eliza
+      - Tanja
+      - MargotM
       - mrngm
-      - Pepper
     lookup: [hotemetoten]
   superkok:
-    req: [1, 1, 1]
+    req: [1, 1, 1, 0]
-    personen: [MacGyver, Annelies, Mieksies]
+    personen: [MacGyver, carrot, Pepper]
     workload: 4
     lookup: [superkok]
     hardcode:
       - MacGyver
-      - Annelies
+      - carrot
-      - Mieksies
+      - Pepper
   snijden:
-    req: [2, 3, 3]
+    req: [2, 3, 3, 0]
     workload: 2
     personen: iedereen
     lookup: [snijden]
   koken:
-    req: [3, 3, 3]
+    req: [3, 3, 3, 0]
     workload: 3
     personen: liefhebbers
     lookup: [koken, kookhulp, hulpkoken]
   afwassen:
-    req: [3, 6, 6]
+    req: [3, 6, 6, 0]
     workload: 2
     personen: iedereen
     lookup: [afwassen]
   schoonmaken:
-    req: [2, 4, 4]
+    req: [2, 4, 4, 0]
     workload: 2
     personen: iedereen
     lookup: [schoonmaken]
   snackdealen:
-    req: [2, 4, 4]
+    req: [2, 4, 4, 0]
     workload: 1
     personen: iedereen
     lookup: [hapjes, snackdealen]
   fotograferen:
-    req: [2, 3, 3]
+    req: [2, 3, 3, 0]
     workload: 2
     personen: liefhebbers
     lookup: [fotograferen]
   pendelen:
-    req: [1, 1, 1]
+    req: [1, 1, 1, 0]
     workload: 2
     personen: liefhebbers
     lookup: [pendelen]
 people:
 - Abel
-- Anita
+- avel
-- Annelies
+- Blu
-- Blondie
+- carrie
 - carrot
+- cuttlefish
 - Dusk
 - Eliza
-- Harm
+#- Harm
-- John
+- Harmen
-- Joost
+- Laurens
 - Leonie
-- lynn
-- Loki
 - lucus
+- Lynn
 - Lyra
 - Maaike
-- Mabl
+- Mabel
 - MacGyver
-- mapzie
+- Mapzie
-- Margot
+- MargotM
-- Marion
 - Marlon
 - Mieksies
+- mike
 - Minnozz
-- MrNGm
+- mrngm
 - Nova
 - PaxSum
 - Pepper
-- petervdv
+- Petervdv
+- PP
 - Quis
 - Rian
-- Roflincopter
+- roflin
+- RTB
 - Sjors
 - SyntaxTerror
 - Tanja
+#- Tauri
 - Thom
-- Wassasin
 - Weasel
 - Yorick

magisch_corvee_script.py

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#!nix-shell -i python3 -p python3 python3Packages.pyyaml glpk -I nixpkgs=flake:nixpkgs
+#!nix-shell -i python3 -p python3 python3Packages.pyyaml glpk -I nixpkgs=flake:nixpkgs --extra-experimental-features flakes
 import sys
 import yaml
 import re
@@ -143,6 +143,9 @@ def write_data(people, tasks, file=sys.stdout):
     print(glpm.param("WL", config['weights']['likes']), file=file)
     print(glpm.param("WH", config['weights']['hates']), file=file)
 def write_tasks(people, tasks, file=sys.stdout):
+    days_tpl = " dag !!" * config['days']
+    print("! {} !!{} {} !! {}".format("wie", days_tpl, "vrolijkheid", "workload"), file=file)
+    print("|-", file=file)
     for name, p in people.items():
         days = [[] for i in range(config['days'])]
         for (d,t) in p.does:
@@ -151,7 +154,7 @@ def write_tasks(people, tasks, file=sys.stdout):
         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("|-", file=file)
 people = read_people(conf['people'])
 with open('prefs_table', 'r') as pref_file:
     read_prefs(pref_file, tasks, people)

prefs_table

@@ -1,31 +1,26 @@
-Abel 	-	pendelen
+Abel	fotograferen, snijden, koken	pendelen
-Anita 	schoonmaken, afwassen 	fotograferen, pendelen
+avel	snackdealen, fotograferen	koken, snijden, afwassen
-carrot 	koken, snijden 	-
+Blu	koken	schoonmaken, snackdealen
-Dusk 	pendelen, snijden, koken 	afwassen, schoonmaken
+Carrie	snijden, pendelen	snackdealen, koken
-Eliza 	schoonmaken, koken, snijden 	snackdealen, pendelen, afwassen
+Cuttlefish	koken, snijden, afwassen, schoonmaken	snackdealen, fotograferen
-Harm 	pendelen, fotograferen 	snackdealen, schoonmaken
+Dusk	koken	schoonmaken, afwassen, snackdealen
-Joost 	snijden 	fotograferen, pendelen, schoonmaken, snackdealen
+Laurens	pendelen, koken, snijden	schoonmaken, afwassen, fotograferen
-Leonie 	koken, snijden, pendelen 	snackdealen, fotograferen
+Leonie	pendelen, snijden	schoonmaken, snackdealen
-Loki 	snijden, koken, snackdealen 	afwassen, schoonmaken
+lucus	snijden, koken	snackdealen, schoonmaken
-lucus 	koken, snijden 	schoonmaken, snackdealen
+lynn	snackdealen	schoonmaken, koken, afwassen, snijden
-lynn 	koken, snackdealen, schoonmaken 	afwassen, snijden, koken
+Lyra	schoonmaken, afwassen, snackdealen	snijden, koken
-Maaike 	snijden, koken, afwassen 	snackdealen, fotograferen, pendelen
+Maaike	afwassen	schoonmaken, snackdealen
-Mabl 	snijden, schoonmaken 	fotograferen, pendelen, snackdealen
+Mabel	schoonmaken, afwassen	snackdealen, koken
-mapzie 	snackdealen 	snijden, koken, schoonmaken, afwassen
+Marlon	koken, snijden, snackdealen	schoonmaken, afwassen
-Margot 	snijden, koken, afwassen 	snackdealen, schoonmaken
+Minnozz	fotograferen, snijden	schoonmaken, afwassen
-Marion 	snijden, koken, afwassen 	snackdealen, fotograferen, schoonmaken
+Nova	pendelen, koken, snijden	schoonmaken, afwassen, snackdealen
-Marlon 	koken, snijden 	afwassen, schoonmaken
+PaxSum	koken, snijden	schoonmaken, snackdealen
-Minnozz 	fotograferen, snijden 	schoonmaken, afwassen
+Petervdv	pendelen, snackdealen	snijden, koken, afwassen, fotograferen
-Nova 	pendelen, koken, snijden 	snackdealen, fotograferen, schoonmaken
+PP	koken, snijden	snackdealen
-PaxSum 	snijden, koken, afwassen 	fotograferen, snackdealen
+Quis	snijden	schoonmaken, fotograferen
-petervdv 	snackdealen, pendelen 	-
+Rian	afwassen, snijden	schoonmaken, snackdealen
-Quis 	snackdealen, koken, snijden 	fotograferen, schoonmaken
+roflin	afwassen schoonmaken	snackdealen koken
-Rian 	snijden, afwassen 	snackdealen, fotograferen, pendelen
+SyntaxTerror	schoonmaken, afwassen	koken, pendelen, snackdealen
-Roflincopter 	schoonmaken, afwassen 	koken
+Thom	afwassen	fotograferen, snackdealen
-Sjors 	pendelen, snackdealen 	koken, afwassen
+Weasel	fotograferen, snijden	koken, schoonmaken
-SyntaxTerror 	snijden, schoonmaken, afwassen 	snackdealen, pendelen
+Yorick	snijden, koken	snackdealen
-Tanja 	snijden, koken, afwassen, schoonmaken 	fotograferen, pendelen
-Thom 	koken, afwassen, pendelen 	fotograferen, snackdealen
-Wassasin 	snackdealen, koken, snijden 	afwassen, schoonmaken, fotograferen
-Weasel 	fotograferen, snijden 	schoonmaken, snackdealen
-Yorick 	koken, snijden, afwassen 	snackdealen, fotograferen

wiki_to_prefs_table.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+
+import sys
+
+def process_line(line):
+    line = line.rstrip(" \n")
+    if line == "|-":
+        return
+    if not line.startswith("|"):
+        return
+    line = line.lstrip("| ")
+    line = line.replace("[[", "")
+    line = line.replace("]]", "")
+    line = line.replace("User:", "")
+
+    splitted = [x.strip() for x in line.split("||")]
+    if len(splitted[0].split("|")) == 2:
+        splitted[0] = splitted[0].split("|")[1]
+    if splitted[1] == "":
+        splitted[1] = "-"
+    if splitted[2] == "":
+        splitted[2] = "-"
+
+    print(f"{splitted[0]}\t{splitted[1]}\t{splitted[2]}")
+
+def main():
+    for line in sys.stdin:
+        process_line(line)
+
+if __name__ == "__main__":
+    main()