Simplify smart pointers exercise for essentials course.

hageboeck · hageboeck · commit 12768e8e1a2d · 2023-03-10T12:21:33.000+01:00
Suggest to only work on part 1 and 2 in the essentials course. Part 3 is
optional in the essentials.
diff --git a/code/ExerciseSchedule_EssentialCourse.md b/code/ExerciseSchedule_EssentialCourse.md
@@ -49,6 +49,6 @@ Day 3 - Modern C++ Exercises
 
 ### Generic programming / templates (directory: [`templates`](templates), [CheatSheet](ExercisesCheatSheet.md#generic-programming--templates-directory-templates))
 
-### Smart pointers (directory: [`smartPointers`](smartPointers), [CheatSheet](ExercisesCheatSheet.md#smart-pointers-directory-smartpointers))
+### Smart pointers part 1 and 2 (directory: [`smartPointers`](smartPointers), [CheatSheet](ExercisesCheatSheet.md#smart-pointers-directory-smartpointers))
 
 ### Standard algorithms and lambdas (directory: [`stl`](stl), [CheatSheet](ExercisesCheatSheet.md#standard-algorithms-and-lambdas-directory-stl))
diff --git a/code/ExercisesCheatSheet.md b/code/ExercisesCheatSheet.md
@@ -134,6 +134,8 @@ The goal is to use STL algorithms. I would advise to start in this order :
 ### Smart pointers (directory: [`smartPointers`](smartPointers))
 
 Here we have four code snippets that will benefit from using smart pointers.
+**Essentials**: Work on part 1 and 2
+**Advanced**: Try all parts
 
 - `problem1` is a simple case of usage of `make_unique` with an observer pattern where the raw pointer should be used.
 - `problem2` is an example of a collection of pointers. Move semantic has to be used to transfer ownership of newly created objects to the container (alternatively, `emplace_back`).
diff --git a/code/smartPointers/README.md b/code/smartPointers/README.md
@@ -21,5 +21,5 @@ and make most cleanup code unnecessary.
 ```
 valgrind --leak-check=full --track-origins=yes ./smartPointers
 ```
-* Go through `problem1()` to `problem3()` and fix the leaks using smart pointers.
-* `problem4()` is the most difficult. Skip if not enough time.
+* In the **essentials course**, work on `problem1()` and `problem2()`, and fix the leaks using smart pointers.
+* In the **advanced course**, work on `problem1()` to `problem4()`. Skip `problem4()` if you don't have enough time.
diff --git a/code/smartPointers/smartPointers.cpp b/code/smartPointers/smartPointers.cpp
@@ -14,7 +14,14 @@
  * Please fix all memory leaks / ownership problems using smart pointers.
  * (Verify by running the program with valgrind!)
  *
- * In main() at the bottom, comment in all parts as you progress through the exercise.
+ * In the *essentials course*:
+ * - Work on problem1() and problem2()
+ * - You can have a look at problem3() if interested
+ *
+ * In the *advanced course*:
+ * - Work on problem1() to problem4()
+ *
+ * In main() at the bottom, comment in the different parts as you progress through the exercise.
  *
  * Remember that:
  * - The unique ownership of data is expressed using unique_ptr.
diff --git a/code/smartPointers/solution/smartPointers.sol.cpp b/code/smartPointers/solution/smartPointers.sol.cpp
@@ -15,7 +15,14 @@
  * Please fix all memory leaks / ownership problems using smart pointers.
  * (Verify by running the program with valgrind!)
  *
- * In main() at the bottom, comment in all parts as you progress through the exercise.
+ * In the *essentials course*:
+ * - Work on problem1() and problem2()
+ * - You can have a look at problem3() if interested
+ *
+ * In the *advanced course*:
+ * - Work on problem1() to problem4()
+ *
+ * In main() at the bottom, comment in the different parts as you progress through the exercise.
  *
  * Remember that:
  * - The unique ownership of data is expressed using unique_ptr.
diff --git a/talk/morelanguage/raii.tex b/talk/morelanguage/raii.tex
@@ -438,7 +438,8 @@
         $ valgrind --leak-check=full --track-origins=yes ./smartPointers
       \end{minted}
       }
-    \item Go through {\ttfamily problem1()} to {\ttfamily problem3()} and fix the leaks using smart pointers.
+    \item In the \emph{essentials course}, go through {\ttfamily problem1()} and {\ttfamily problem2()} and fix the leaks using smart pointers.
+    \item In the \emph{advanced course}, go through {\ttfamily problem1()} to {\ttfamily problem4()} and fix the leaks using smart pointers.
     \item {\ttfamily problem4()} is the most difficult. Skip if not enough time.
     \end{itemize}
   \end{exercise}
