Simplifying exercises worflow.

princomp · Sep 17, 2024 · 3c41494 · 3c41494
1 parent a53d869
commit 3c41494
Show file tree

Hide file tree

Showing 48 changed files with 130 additions and 161 deletions.
diff --git a/source/Makefile b/source/Makefile
@@ -67,9 +67,7 @@ LABS_DIR = labs/
 # The folder where the exercises are located.
 EXO_DIR = exercises/
 # The folder where the exercises with solution are located.
-EXO_W_SOL_DIR = $(EXO_DIR)w_sol
-# The folder where the exercises without solution are located.
-EXO_WO_SOL_DIR = $(EXO_DIR)wo_sol
+EXO_W_SOL_DIR = exercises_w_sol/
 # The folder where the projects (that is, the projects the students have to complete) are located.
 PROJ_DIR = projects/
 # The folder where the .cs code snippets and projects are located.
@@ -280,7 +278,7 @@ $(CLA_DIR)%.md: $(CLA_DIR)%.txt
 	tr '\n' ' ' < $@ > diag-temp.md && mv diag-temp.md $@
 
 # Exercise without solution
-$(EXO_WO_SOL_DIR)%.md: $(EXO_W_SOL_DIR)%.md
+$(EXO_DIR)%.md: $(EXO_W_SOL_DIR)%.md
 	mkdir -p $(dir $@)
 	sed 's/<details>/&\\\n/g' $< > $@ 
 	sed -i '/<details>/,/<\/details>/d' $@
@@ -291,10 +289,10 @@ $(EXO_WO_SOL_DIR)%.md: $(EXO_W_SOL_DIR)%.md
 
 # Rule to compile all the exercises in one go.
 SOURCE_EXO_W_SOL := $(shell find $(EXO_W_SOL_DIR) -name '*.md')
-TARGET_EXO_WO_SOL := $(subst w_sol,wo_sol,$(SOURCE_EXO_W_SOL)))
+TARGET_EXO_WO_SOL := $(subst exercises_w_sol,exercises,$(SOURCE_EXO_W_SOL)))
 
 exercise: $(TARGET_EXO_WO_SOL)
-	
+
 # -------------------------------
 # Order file
 # -------------------------------

diff --git a/.../exercises/wo_sol/collections/1darrays.md → source/exercises/collections/1darrays.md b/.../exercises/wo_sol/collections/1darrays.md → source/exercises/collections/1darrays.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/collections/1darrays.md, and run
-make exercises/wo_sol/collections/1darrays.md
+Edit exercises_w_sol/collections/1darrays.md, and run
+make exercises/collections/1darrays.md
 instead.
 -->
 
@@ -14,7 +14,7 @@ tags:
 
 # One-Dimensional Arrays
 
-[Solutions for those exercises.](./exercises/w_sol/collections/1darrays)
+[Solutions for those exercises.](./exercises_w_sol/collections/1darrays)
 
 ## Multiple Choices
 

diff --git a/.../exercises/wo_sol/collections/2darrays.md → source/exercises/collections/2darrays.md b/.../exercises/wo_sol/collections/2darrays.md → source/exercises/collections/2darrays.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/collections/2darrays.md, and run
-make exercises/wo_sol/collections/2darrays.md
+Edit exercises_w_sol/collections/2darrays.md, and run
+make exercises/collections/2darrays.md
 instead.
 -->
 
@@ -14,7 +14,7 @@ tags:
 
 # Two-Dimensional Arrays
 
-[Solutions for those exercises.](./exercises/w_sol/collections/2darrays)
+[Solutions for those exercises.](./exercises_w_sol/collections/2darrays)
 
 ## Multiple Choices
 

diff --git a/...e/exercises/wo_sol/datatypes/datatypes.md → source/exercises/datatypes/datatypes.md b/...e/exercises/wo_sol/datatypes/datatypes.md → source/exercises/datatypes/datatypes.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/datatypes/datatypes.md, and run
-make exercises/wo_sol/datatypes/datatypes.md
+Edit exercises_w_sol/datatypes/datatypes.md, and run
+make exercises/datatypes/datatypes.md
 instead.
 -->
 

diff --git a/source/exercises/datatypes/index.md b/source/exercises/datatypes/index.md
@@ -0,0 +1,12 @@
+<!--
+
+DO NOT EDIT THIS FILE
+
+Edit exercises_w_sol/datatypes/index.md, and run
+make exercises/datatypes/index.md
+instead.
+-->
+
+---
+title: Datatypes
+---
diff --git a/...e/exercises/wo_sol/datatypes/numerical.md → source/exercises/datatypes/numerical.md b/...e/exercises/wo_sol/datatypes/numerical.md → source/exercises/datatypes/numerical.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/datatypes/numerical.md, and run
-make exercises/wo_sol/datatypes/numerical.md
+Edit exercises_w_sol/datatypes/numerical.md, and run
+make exercises/datatypes/numerical.md
 instead.
 -->
 

diff --git a/source/exercises/wo_sol/datatypes/strings.md → source/exercises/datatypes/strings.md b/source/exercises/wo_sol/datatypes/strings.md → source/exercises/datatypes/strings.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/datatypes/strings.md, and run
-make exercises/wo_sol/datatypes/strings.md
+Edit exercises_w_sol/datatypes/strings.md, and run
+make exercises/datatypes/strings.md
 instead.
 -->
 

diff --git a/source/exercises/wo_sol/flow/conditionals.md → source/exercises/flow/conditionals.md b/source/exercises/wo_sol/flow/conditionals.md → source/exercises/flow/conditionals.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/flow/conditionals.md, and run
-make exercises/wo_sol/flow/conditionals.md
+Edit exercises_w_sol/flow/conditionals.md, and run
+make exercises/flow/conditionals.md
 instead.
 -->
 

diff --git a/source/exercises/flow/index.md b/source/exercises/flow/index.md
@@ -0,0 +1,12 @@
+<!--
+
+DO NOT EDIT THIS FILE
+
+Edit exercises_w_sol/flow/index.md, and run
+make exercises/flow/index.md
+instead.
+-->
+
+---
+title: Control Structures
+---
diff --git a/source/exercises/wo_sol/flow/iteratives.md → source/exercises/flow/iteratives.md b/source/exercises/wo_sol/flow/iteratives.md → source/exercises/flow/iteratives.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/flow/iteratives.md, and run
-make exercises/wo_sol/flow/iteratives.md
+Edit exercises_w_sol/flow/iteratives.md, and run
+make exercises/flow/iteratives.md
 instead.
 -->
 

diff --git a/source/exercises/index.md b/source/exercises/index.md
@@ -1,6 +1,12 @@
+<!--
+
+DO NOT EDIT THIS FILE
+
+Edit exercises_w_sol/index.md, and run
+make exercises/index.md
+instead.
+-->
+
 ---
-title: Exercises
+title: With Solution
 ---
-
-This folder will contain exercises as they migrate from <https://csci-1301.github.io/#exercises>.
-In the meantime, please refer to the previous link.
diff --git a/source/exercises/io/index.md b/source/exercises/io/index.md
@@ -0,0 +1,12 @@
+<!--
+
+DO NOT EDIT THIS FILE
+
+Edit exercises_w_sol/io/index.md, and run
+make exercises/io/index.md
+instead.
+-->
+
+---
+title: input / output
+---
diff --git a/source/exercises/oop/index.md b/source/exercises/oop/index.md
@@ -0,0 +1,12 @@
+<!--
+
+DO NOT EDIT THIS FILE
+
+Edit exercises_w_sol/oop/index.md, and run
+make exercises/oop/index.md
+instead.
+-->
+
+---
+title: OOP
+---
diff --git a/source/exercises/wo_sol/oop/objects.md → source/exercises/oop/objects.md b/source/exercises/wo_sol/oop/objects.md → source/exercises/oop/objects.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/oop/objects.md, and run
-make exercises/wo_sol/oop/objects.md
+Edit exercises_w_sol/oop/objects.md, and run
+make exercises/oop/objects.md
 instead.
 -->
 

diff --git a/source/exercises/wo_sol/oop/oop.md → source/exercises/oop/oop.md b/source/exercises/wo_sol/oop/oop.md → source/exercises/oop/oop.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/oop/oop.md, and run
-make exercises/wo_sol/oop/oop.md
+Edit exercises_w_sol/oop/oop.md, and run
+make exercises/oop/oop.md
 instead.
 -->
 

diff --git a/source/exercises/wo_sol/oop/operations.md → source/exercises/oop/operations.md b/source/exercises/wo_sol/oop/operations.md → source/exercises/oop/operations.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/oop/operations.md, and run
-make exercises/wo_sol/oop/operations.md
+Edit exercises_w_sol/oop/operations.md, and run
+make exercises/oop/operations.md
 instead.
 -->
 

diff --git a/source/exercises/wo_sol/oop/structures.md → source/exercises/oop/structures.md b/source/exercises/wo_sol/oop/structures.md → source/exercises/oop/structures.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/oop/structures.md, and run
-make exercises/wo_sol/oop/structures.md
+Edit exercises_w_sol/oop/structures.md, and run
+make exercises/oop/structures.md
 instead.
 -->
 

diff --git a/source/exercises/wo_sol/past/exercises.md → source/exercises/past/exercises.md b/source/exercises/wo_sol/past/exercises.md → source/exercises/past/exercises.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/past/exercises.md, and run
-make exercises/wo_sol/past/exercises.md
+Edit exercises_w_sol/past/exercises.md, and run
+make exercises/past/exercises.md
 instead.
 -->
 
@@ -13,7 +13,7 @@ title: Exercises
 
 # Homework #1
 
-[Solutions for those exercises.](./exercises/w_sol/past/exercises)
+[Solutions for those exercises.](./exercises_w_sol/past/exercises)
 
 ## Part I --- Questions
 
@@ -124,7 +124,7 @@ compiled, and executed.
 
 # Homework #2
 
-[Solutions for those exercises.](./exercises/w_sol/past/exercises)
+[Solutions for those exercises.](./exercises_w_sol/past/exercises)
 
 ## Part I --- Questions
 
@@ -350,7 +350,7 @@ Make sure you feel ready before starting them, try to do them with limited time
 
 # Homework #3
 
-[Solutions for those exercises.](./exercises/w_sol/past/exercises)
+[Solutions for those exercises.](./exercises_w_sol/past/exercises)
 
 ## Part I -- Questions
 
@@ -535,7 +535,7 @@ There is only one problem this time, and it is harder than what you'll be asked
 
 # Homework #4
 
-[Solutions for those exercises.](./exercises/w_sol/past/exercises)
+[Solutions for those exercises.](./exercises_w_sol/past/exercises)
 
 ## Part I --- Questions
 
@@ -776,7 +776,7 @@ This time, the two exercises **do not** require a computer, and are here to craf
 
 # Homework #5
 
-[Solutions for those exercises.](./exercises/w_sol/past/exercises)
+[Solutions for those exercises.](./exercises_w_sol/past/exercises)
 
 ## Part I --- Questions
 
@@ -873,7 +873,7 @@ This time, the two exercises **do not** require a computer, and are here to craf
 
 # Homework #6
 
-[Solutions for those exercises.](./exercises/w_sol/past/exercises)
+[Solutions for those exercises.](./exercises_w_sol/past/exercises)
 
 ## Part I --- Questions
 
@@ -993,7 +993,7 @@ This time, the two exercises **do not** require a computer, and are here to craf
 
 # Quizzes
 
-[Solutions for those exercises.](./exercises/w_sol/past/exercises)
+[Solutions for those exercises.](./exercises_w_sol/past/exercises)
 
 
 Those quizzes are given as _examples_, to help you practise.

diff --git a/source/exercises/wo_sol/past/mcq.md → source/exercises/past/mcq.md b/source/exercises/wo_sol/past/mcq.md → source/exercises/past/mcq.md
@@ -2,8 +2,8 @@
 
 DO NOT EDIT THIS FILE
 
-Edit exercises/w_sol/past/mcq.md, and run
-make exercises/wo_sol/past/mcq.md
+Edit exercises_w_sol/past/mcq.md, and run
+make exercises/past/mcq.md
 instead.
 -->