Merge branch 'main' of gitlab.tudelft.nl:mude/2024-files

content/week_1_5/PA/.github/workflows/classroom.yml

+name: Autograding Tests
+'on':
+- push
+- repository_dispatch
+permissions:
+  checks: write
+  actions: read
+  contents: read
+jobs:
+  run-autograding-tests:
+    runs-on: ubuntu-latest
+    if: github.actor != 'github-classroom[bot]'
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.pull_request.head.sha }} #https://stackoverflow.com/questions/62334460/git-history-in-a-github-action
+        fetch-depth: 0
+    - name: Check for merge request
+      id: check-merge
+      uses: classroom-resources/autograding-command-grader@v1
+      with:
+        test-name: Check whether merge request has been performed
+        setup-command:
+        command: if git log --oneline --all | grep Merge; then echo "merge found"; else echo "No merge found"; exit 1; fi
+        timeout: 10
+        max-score: 10
+    - name: Check notebook
+      id: check-notebook
+      uses: classroom-resources/autograding-command-grader@v1
+      with:
+        test-name: Check notebook
+        setup-command: pip install numpy scipy pandas matplotlib jupyter ipykernel pip
+        command: jupyter nbconvert --execute PA_1_5.ipynb --to html
+        timeout: 10
+        max-score: 10
+    - name: Autograding Reporter
+      uses: classroom-resources/autograding-grading-reporter@v1
+      env:
+        CHECK-MERGE_RESULTS: "${{steps.check-merge.outputs.result}}"
+        CHECK-NOTEBOOK_RESULTS: "${{steps.check-notebook.outputs.result}}"
+      with:
+        runners: check-merge,check-notebook
\ No newline at end of file

content/week_1_5/PA/README.md

@@ -5,57 +5,17 @@
 
 You can access the assignment with this link: [classroom.github.com/a/-](https://classroom.github.com/a/-)
 
-This PA consists of 3 parts:
+This PA consists of 4 parts:
 
-1. Read the chapter in [Programming for Week 1.5](https://mude.citg.tudelft.nl/2024/book/programming/week_1_4.html) about branching, forking, pull requests and merge conflicts
-2. Some assignment on your own branch --> merge back to main
-3. Fork the ICE repo --> merge back your prediction to main of the ICE repo
-
-### Passing the PA
+1. Read the chapter in [Programming for Week 1.5](https://mude.citg.tudelft.nl/2024/book/programming/week_1_5.html) about branching, forking, pull requests and merge conflicts
+2. Crossword puzzle in `crossword.md` this repository with branches and merging into main.
+3. Python list comprehension, plt.bar() and asserts in `... .ipynb` in this repository`
+4. Contribute to the ice repo from your own fork
 
 You will pass this PA if:
 1. You successfully merged a pull request from your own branch
-2. You successfully created a pull request to the ICE repo.
-
-You can verify that you passed the first part of the assignment by looking for the green circle when you have pushed your commit to your personal repo, it runs automatically just like last week when you uploaded your notebook.
-For the second part, a green circle should emerge in the pull request you make to the ICE repo.
-
-### Filling in the crossword
-Fill in the words replacing the `-` in `crossword.md` and commit to main
-
-Tip: select `no wrap`:
-
-![no wrap](auxiliary_files/no_wrap.png)
-
-![Mude crossword](auxiliary_files/mude.svg)
-
-Across
-- (9) Organizational control, 10 letters
-- (10) Data analysis, 10 letters
-- (12) Information, often numerical, 4 letters
-- (13) Earth-related engineering, 11 letters
-- (16) Forces and motions, 9 letters
-- (17) Potential hazards, 5 letters
-- (20) Substances for construction, 9 letters
-- (21) Moral principles, 6 letters.
-- (23) Upkeep and repair, 11 letters
-- (24) Efficiency improvement, 12 letters
-- (25) Imitation of operation, 10 letters
-- (26) Movement of goods or people, 9 letters
+2. You successfully performed the tasks in ...
+3. You successfully created a pull request to the ice repo.
 
-Down
-- (1) Long-term viability, 14 letters
-- (2) Programming computers, 6 letters
-- (3) City development, 12 letters
-- (4) Constructed buildings or frameworks, 10 letters
-- (5) Fluids in motion, 9 letters
-- (6) Combining fields, 16 letters
-- (7) Physical behaviors, 9 letters
-- (8) Choices made, 9 letters
-- (11) Complex networks, 7 letters
-- (14) Surrounding natural world, 11 letters
-- (15) Available supplies, 9 letters
-- (18) Weather patterns, 7 letters
-- (19) Information exchange, 13 letters
-- (20) Simulating real-world systems, 9 letters
-- (22) Lack of sureness, 11 letters
+You can verify that you passed the by looking for the green circle in this repository. It runs automatically just like last week when you uploaded your notebook.
+For the ice repository, a green circle should emerge in the pull request you make to the ice repo.

content/week_1_5/PA/auxiliary_files/convert.py

-import markdown
-
-with open('crossword.md', 'r') as f:
-    text = f.read()
-    html = markdown.markdown(text,extensions=['markdown.extensions.tables','sane_lists'])
-
-with open('auxiliary_files/crossword.html', 'w') as f:
-    f.write(html)
\ No newline at end of file

content/week_1_5/PA/crossword.md

+## Part 2: Crossword puzzle
+
+1. Fill in some words replacing the `-` in this file `crossword.md` and commit to a separate branch as explained in the book. Tip for editing the crossword puzzle in `crossword.md`: select `no wrap`: ![no wrap](auxiliary_files/no_wrap.png)
+2. Create a pull request, eventually solve merge conflicts and merge your changes into main
+3. Eventually repeat that for multiple words on separate branches. Do you notice when merge conflicts appear?
+
+
 |                        |🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|
 | :--------------------: |:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|
 | &#128288;<br>&#128290; |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      | (1) -|      |