Merge branch '2025' of github.com:minprog/programmeren-1 into 2025

Author: stgm

_schedules/1 Herfst/grading.yml

@@ -122,8 +122,8 @@ module_7:
         alfabet: 1
         wachtwoord: 1
         scrabble: 1
-        # sattelite: 1
-        # render: 1
+        satellite_less: 1
+        render: 1
 
         # decryptor: 1
 
@@ -142,13 +142,15 @@ module_9:
 
 module_10:
     show_progress: true
+    small_block_overview: true
     submits:
         sort_single: 1  # kan weer un-single??? TODO
         find_single: 1
         runoff: 1
 
 module_11:
     show_progress: true
+    small_block_overview: true
     submits:
         tiles_single: 1
         snowfall: 1
@@ -158,17 +160,14 @@ module_12:
     show_progress: true
     small_block_overview: true
     submits:
-        unix_cat: 2
-        unix_head: 2
-        unix_nl: 2
-        unix_wc: 2
-        unix_uniq: 2
-        unix_cut: 2
-        unix_paste: 2
-        unix_strings: 1
-        unix_tail: 1
-        recover: 1
-        filetype: 1
+        unix_cat: 1
+        unix_head: 1
+        unix_nl: 1
+        unix_wc: 1
+        unix_uniq: 1
+        unix_cut: 1
+        unix_paste: 1
+
 
 module_13:
     show_progress: true
@@ -180,16 +179,41 @@ module_13:
         c_strcat: 1
         c_strdup: 1
         c_strsep: 1
-        wave: 1
 
 module_14:
     show_progress: true
     small_block_overview: true
     submits:
-        beatles: 7
-        linked: 7
-        speller: 7
-        speller_challenge: 6
+        beatles: 1
+        linked: 1
+        speller: 1
+
+module_11*:
+    show_progress: true
+    small_block_overview: true
+    submits:
+        resize: 1
+
+module_12*:
+    show_progress: true
+    small_block_overview: true
+    submits:
+        unix_strings: 1
+        unix_tail: 1
+        recover: 1
+        filetype: 1
+
+module_13*:
+    show_progress: true
+    small_block_overview: true
+    submits:
+        wave: 1
+
+module_14*:
+    show_progress: true
+    small_block_overview: true
+    submits:
+        speller_challenge: 1
 
 ster:
     show_overview: true
@@ -209,6 +233,7 @@ ster:
         # mod 6
         strings_more: 1
         # mod 7
+        satellite_more: 1
         decryptor: 1
         # mod 8
         morse_more: 1
@@ -219,18 +244,16 @@ punten:
     type: points
     fill_missing: true
     show_progress: true
-    small_block_overview: true
+    show_overview: true
     submits:
-        punten_module_9: 7
-        punten_module_9_challenge: 2
-        punten_module_10: 7
-        punten_module_10_challenge: 2
-        punten_module_11: 7
-        punten_module_11_challenge: 2
-        punten_module_12: 7
-        punten_module_12_challenge: 2
-        punten_module_13: 7
-        punten_module_13_challenge: 2
+        punten_module_11: 5
+        punten_module_11_challenge: 5
+        punten_module_12: 5
+        punten_module_12_challenge: 5
+        punten_module_13: 5
+        punten_module_13_challenge: 5
+        punten_module_14: 5
+        punten_module_14_challenge: 5
 
 tentamenoefeningen:
     show_overview: true

_schedules/1 Herfst/schedule.yml

@@ -144,7 +144,7 @@ Module 8:
         Morse++*: /problems/morse_more
 
 Module 9:
-    Oefententamen: /tentamen/oefententamen
+    Oefententamen: /tentamen/oefententamen_thuis
 
 #-------- week 4 --------
 

grading.yml

@@ -133,6 +133,9 @@ grades:
     cypher: *automatic
     wachtwoord: *automatic
     decryptor: *automatic
+    satellite_less: *automatic
+    render: *automatic
+    satellite_more: *automatic
 
     calendar: *automatic
     find:
@@ -196,19 +199,18 @@ grades:
 
     pretest: *exam
     oefententamen: *exam
+    oefententamen_thuis: *exam
     tentamen: *exam
     hertentamen: *exam
 
-    punten_module_9: *check
-    punten_module_9_challenge: *check
-    punten_module_10: *check
-    punten_module_10_challenge: *check
     punten_module_11: *check
     punten_module_11_challenge: *check
     punten_module_12: *check
     punten_module_12_challenge: *check
     punten_module_13: *check
     punten_module_13_challenge: *check
+    punten_module_14: *check
+    punten_module_14_challenge: *check
 
     week_2: *check
     week_3: *check

problems/caffeine/index.md

@@ -109,11 +109,3 @@ Does your code work as prescribed when you input
 - `0.001` (or other positive numbers)?
 - letters or words?
 - no input at all, when you only hit Enter?
-
-You can also execute the below to evaluate the correctness of your code using `check50`. But be sure to compile and test it yourself as well!
-
-    check50 -l minprog/checks/2022/caffeine
-
-Execute the below to evaluate the style of your code using `style50`.
-
-    style50 caffeine.c

problems/calendar/extra/index.md

@@ -42,9 +42,3 @@ Analyseer in ongeveer 500 woorden hoe je uiteindelijke programma is geworden, en
 - Welke principes zou je goed kunnen toepassen bij het schrijven van programma's en waarom? Welke voordelen en nadelen kun je bedenken?
 
 Schrijf je verslag in een bestand `analyse.pdf`.
-
-## Testen
-
-Zorg dat je uiteindelijke programma nog steeds correct werkt met de checks van Calendar:
-
-    check50 -l minprog/checks/2022/calendar

problems/calendar/index.md

@@ -100,17 +100,9 @@ Don't forget that you need to write function **prototypes** above main to be abl
         // actual implementation of this function
     }
 
-## Testing
-
-You can use `check50` to find obvious mistakes, such as months starting on the wrong weekdate. But you should be able to easily test your program manually by `make`ing and running it.
-
-    check50 -l minprog/checks/2025/calendar
-
-Before you hand in your solution, also check for obvious style mistakes using `style50`. But don't overdo it. You'll be doing a code review again next week.
-
 ### What is <padding>?
 
-When `check50` reports the following:
+When submitting, the check might report the following:
 
     expected "<padding> 1"
 

problems/conversion/index.md

@@ -98,11 +98,3 @@ Je programma moet uiteindelijk werken zoals in de voorbeelden hieronder.
 ## Hoe testen
 
 Klaar? Geeft je code de juiste output voor de verschillende combinaties van invoer die mogelijk zijn? En hou je ook goed rekening met foutieve invoer? Als je denkt dat je klaar bent, dan zijn dat de eerste dingen om te checken.
-
-Je kunt ook het volgende commando geven in de Terminal om de correctheid van je programma na te gaan. Zorg dat je altijd zelf ook compileert, fouten oplost en handmatig test, want deze tool is bij volgende vakken niet beschikbaar!
-
-    check50 -l minprog/checks/2022/conversion
-
-En je kunt alvast de stijl van je programma laten controleren op een paar aspecten die vaak misgaan. Die kun je dan verbeteren, maar dit is niet verplicht voor het inleveren van de opdracht.
-
-    style50 conversion.c

problems/figure/index.md

@@ -41,10 +41,3 @@ Now that you have defined the figure in terms of 1) what it looks like and 2) a
 
 Create a file called `figure.c` and implement your program. Make sure that it, like `mario.c`, only accepts heights that are _reasonable_ for the figure that you implemented in code.
 
-## How to Test Your Code
-
-Execute the below to evaluate the correctness of your code using `check50`. But be sure to compile and test it yourself as well!
-
-    check50 -l minprog/checks/2022/figure
-
-Check50 cannot check that your figure is printed according to consistent rules, but it will warn you if you have errors or if you do not perform input validation. After submitting, your program will be checked visually for adherence to the requirements.

problems/filter/less/filter.md

@@ -234,11 +234,3 @@ Finally, the `blur` function should take an image and turn it into a box-blurred
 ## Hints
 
 The values of a pixel's `rgbtRed`, `rgbtGreen`, and `rgbtBlue` components are all integers, so be sure to **round** any floating-point numbers to the nearest integer when assigning them to a pixel value!
-
-## Testing
-
-Be sure to test all of your filters on the sample bitmap files provided!
-
-Execute the below to evaluate the correctness of your code using `check50`. But be sure to compile and test it yourself as well!
-
-    check50 -l minprog/checks/2022/filter/less