EPCCed · JPRichings · Apr 18, 2025 · Apr 17, 2025 · Apr 17, 2025 · Apr 17, 2025
diff --git a/.gitignore b/.gitignore
@@ -1 +1,17 @@
-*.o
+*.o
+catch.hpp
+
+# Ignore executables created by the exercises
+exercises/2.1-class-types/test
+exercises/2.2-complex/test
+exercises/3-containers/part1/test
+exercises/3-containers/part2/test
+exercises/5-templates/part1/sum
+exercises/5-templates/part2/test
+exercises/8-algorithm/ex
+exercises/9-eigen/explicit
+exercises/9-eigen/implicit
+exercises/9-eigen/sparse
+exercises/9-eigen/*.txt
+exercises/9-eigen/*.gif
+exercises/10-threads/area
diff --git a/exercises/threads/Makefile → exercises/10-threads/Makefile b/exercises/threads/Makefile → exercises/10-threads/Makefile
diff --git a/exercises/morton-order/README.md → exercises/10-threads/README.md b/exercises/morton-order/README.md → exercises/10-threads/README.md
diff --git a/exercises/threads/area.cpp → exercises/10-threads/area.cpp b/exercises/threads/area.cpp → exercises/10-threads/area.cpp
diff --git a/exercises/threads/instructions.md → exercises/10-threads/instructions.md b/exercises/threads/instructions.md → exercises/10-threads/instructions.md
diff --git a/exercises/threads/instructions.pdf → exercises/10-threads/instructions.pdf b/exercises/threads/instructions.pdf → exercises/10-threads/instructions.pdf
diff --git a/exercises/2.1-class-types/Makefile b/exercises/2.1-class-types/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS = --std=c++14 -I../include
+CXXFLAGS = --std=c++17 -I../include
 
 test : complex.o test.o
 	$(CXX) $^ -o $@

diff --git a/exercises/2.2-complex/Makefile b/exercises/2.2-complex/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS = --std=c++14 -I../include
+CXXFLAGS = --std=c++17 -I../include
 
 test : complex.o test.o
 	$(CXX) $^ -o $@

diff --git a/exercises/6.1-pointers/Makefile → exercises/4-pointers/Makefile b/exercises/6.1-pointers/Makefile → exercises/4-pointers/Makefile
diff --git a/exercises/6.1-pointers/pointers.cpp → exercises/4-pointers/pointers.cpp b/exercises/6.1-pointers/pointers.cpp → exercises/4-pointers/pointers.cpp
diff --git a/exercises/5-templates/part1/Makefile b/exercises/5-templates/part1/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS = --std=c++14 -I../../include
+CXXFLAGS = --std=c++17 -I../../include
 
 sum : sum.o
 	$(CXX) $^ -o $@

diff --git a/exercises/5-templates/part2/Makefile b/exercises/5-templates/part2/Makefile
@@ -1,13 +1,8 @@
-CXXFLAGS = --std=c++14 -I../../include
+CXXFLAGS = --std=c++17 -I../../include
 
 test : complex.o test.o
 	$(CXX) $^ -o $@
 
-test.o : catch.hpp
-
-catch.hpp :
-	wget https://github.com/catchorg/Catch2/releases/download/v2.13.6/catch.hpp
-
 run : test
 	./test
 

diff --git a/exercises/5-templates/part2/complex.hpp b/exercises/5-templates/part2/complex.hpp
@@ -25,16 +25,20 @@ class Complex {
   friend bool operator==(Complex const& a, Complex const& b);
   friend bool operator!=(Complex const& a, Complex const& b);
 
-  // Declare binary arithmetic operators
-  /* What if I want to add a Complex<double> to a Complex<int>?
-     What would be returned in this case? What should the return type
-     be to make this flexible?
-  */
+  // Declare binary arithmetic operators - Assume both complex numbers have the same template type.
   friend Complex operator+(Complex const& a, Complex const& b);
   friend Complex operator-(Complex const& a, Complex const& b);
   friend Complex operator*(Complex const& a, Complex const& b);
-  friend Complex operator/(Complex const& a, Complex const& b);
-  // Question: how would you declare multiplication and division by a real number?
+
+  /* 
+  Extension: What if I want to add a Complex<double> to a Complex<int>?
+    What would be returned in this case? What should the return type
+    be to make this flexible?
+    Hint: Look up std::common_type from the type_traits header.
+
+  If you complete this extension, uncomment the final test case in
+  test.cpp to test your implementation.
+  */
 
   // Unary negation
   friend Complex operator-(Complex const& a);

diff --git a/exercises/5-templates/part2/test.cpp b/exercises/5-templates/part2/test.cpp
@@ -105,3 +105,16 @@ TEST_CASE("Complex numbers can be templated") {
   REQUIRE(z1.imag() == 5);
   REQUIRE(z1.norm2() == 34);
 }
+
+/*
+Uncomment the code below to test the binary operators extension exercise
+
+TEST_CASE("Complex number binary operators can use two different template types") {
+  const Complex<int> z1{3, 5};
+  const Complex<double> z2{3.4, 5.1};
+  REQUIRE(z1 + z2 == Complex<double>{6.4, 10.1});
+  REQUIRE(std::is_same<decltype(z1 + z2), Complex<double>>::value);
+  REQUIRE(std::is_same<decltype(z1 - z2), Complex<double>>::value);
+  REQUIRE(std::is_same<decltype(z1 * z2), Complex<double>>::value);
+}
+*/
diff --git a/exercises/4-my_array/part1/Makefile → exercises/6.1-my-array/part1/Makefile b/exercises/4-my_array/part1/Makefile → exercises/6.1-my-array/part1/Makefile
diff --git a/exercises/4-my_array/part1/my_array.cpp → exercises/6.1-my-array/part1/my_array.cpp b/exercises/4-my_array/part1/my_array.cpp → exercises/6.1-my-array/part1/my_array.cpp
diff --git a/exercises/4-my_array/part2/Makefile → exercises/6.1-my-array/part2/Makefile b/exercises/4-my_array/part2/Makefile → exercises/6.1-my-array/part2/Makefile
diff --git a/exercises/4-my_array/part2/my_array.cpp → exercises/6.1-my-array/part2/my_array.cpp b/exercises/4-my_array/part2/my_array.cpp → exercises/6.1-my-array/part2/my_array.cpp
diff --git a/exercises/4-my_array/part3/Makefile → exercises/6.1-my-array/part3/Makefile b/exercises/4-my_array/part3/Makefile → exercises/6.1-my-array/part3/Makefile
diff --git a/exercises/4-my_array/part3/my_array.cpp → exercises/6.1-my-array/part3/my_array.cpp b/exercises/4-my_array/part3/my_array.cpp → exercises/6.1-my-array/part3/my_array.cpp
diff --git a/exercises/morton-order/Makefile → exercises/6.3-morton-order/Makefile b/exercises/morton-order/Makefile → exercises/6.3-morton-order/Makefile
diff --git a/exercises/threads/README.md → exercises/6.3-morton-order/README.md b/exercises/threads/README.md → exercises/6.3-morton-order/README.md
diff --git a/exercises/morton-order/bits.hpp → exercises/6.3-morton-order/bits.hpp b/exercises/morton-order/bits.hpp → exercises/6.3-morton-order/bits.hpp
diff --git a/exercises/morton-order/config.mk → exercises/6.3-morton-order/config.mk b/exercises/morton-order/config.mk → exercises/6.3-morton-order/config.mk
diff --git a/exercises/morton-order/instructions.md → exercises/6.3-morton-order/instructions.md b/exercises/morton-order/instructions.md → exercises/6.3-morton-order/instructions.md
diff --git a/exercises/morton-order/instructions.pdf → exercises/6.3-morton-order/instructions.pdf b/exercises/morton-order/instructions.pdf → exercises/6.3-morton-order/instructions.pdf
diff --git a/exercises/morton-order/mortonorder.png → exercises/6.3-morton-order/mortonorder.png b/exercises/morton-order/mortonorder.png → exercises/6.3-morton-order/mortonorder.png
diff --git a/exercises/morton-order/range.hpp → exercises/6.3-morton-order/range.hpp b/exercises/morton-order/range.hpp → exercises/6.3-morton-order/range.hpp
diff --git a/exercises/morton-order/step1/Makefile → exercises/6.3-morton-order/step1/Makefile b/exercises/morton-order/step1/Makefile → exercises/6.3-morton-order/step1/Makefile
diff --git a/exercises/morton-order/step1/matrix.hpp → exercises/6.3-morton-order/step1/matrix.hpp b/exercises/morton-order/step1/matrix.hpp → exercises/6.3-morton-order/step1/matrix.hpp
diff --git a/...s/morton-order/step1/test_matrix_base.cpp → ...3-morton-order/step1/test_matrix_base.cpp b/...s/morton-order/step1/test_matrix_base.cpp → ...3-morton-order/step1/test_matrix_base.cpp
diff --git a/exercises/morton-order/step2/Makefile → exercises/6.3-morton-order/step2/Makefile b/exercises/morton-order/step2/Makefile → exercises/6.3-morton-order/step2/Makefile
diff --git a/exercises/morton-order/step2/matrix.hpp → exercises/6.3-morton-order/step2/matrix.hpp b/exercises/morton-order/step2/matrix.hpp → exercises/6.3-morton-order/step2/matrix.hpp
diff --git a/...s/morton-order/step2/test_matrix_base.cpp → ...3-morton-order/step2/test_matrix_base.cpp b/...s/morton-order/step2/test_matrix_base.cpp → ...3-morton-order/step2/test_matrix_base.cpp
diff --git a/...s/morton-order/step2/test_matrix_iter.cpp → ...3-morton-order/step2/test_matrix_iter.cpp b/...s/morton-order/step2/test_matrix_iter.cpp → ...3-morton-order/step2/test_matrix_iter.cpp
diff --git a/exercises/morton-order/test.hpp → exercises/6.3-morton-order/test.hpp b/exercises/morton-order/test.hpp → exercises/6.3-morton-order/test.hpp
diff --git a/exercises/morton-order/test_bits.cpp → exercises/6.3-morton-order/test_bits.cpp b/exercises/morton-order/test_bits.cpp → exercises/6.3-morton-order/test_bits.cpp
diff --git a/exercises/algorithm/Makefile → exercises/8-algorithm/Makefile b/exercises/algorithm/Makefile → exercises/8-algorithm/Makefile
diff --git a/exercises/algorithm/README.md → exercises/8-algorithm/README.md b/exercises/algorithm/README.md → exercises/8-algorithm/README.md
diff --git a/exercises/algorithm/ex.cpp → exercises/8-algorithm/ex.cpp b/exercises/algorithm/ex.cpp → exercises/8-algorithm/ex.cpp
diff --git a/exercises/eigen/Makefile → exercises/9-eigen/Makefile b/exercises/eigen/Makefile → exercises/9-eigen/Makefile
diff --git a/exercises/eigen/README.md → exercises/9-eigen/README.md b/exercises/eigen/README.md → exercises/9-eigen/README.md
diff --git a/exercises/eigen/explicit.cpp → exercises/9-eigen/explicit.cpp b/exercises/eigen/explicit.cpp → exercises/9-eigen/explicit.cpp
diff --git a/exercises/eigen/implicit.cpp → exercises/9-eigen/implicit.cpp b/exercises/eigen/implicit.cpp → exercises/9-eigen/implicit.cpp
diff --git a/exercises/eigen/modules.sh → exercises/9-eigen/modules.sh b/exercises/eigen/modules.sh → exercises/9-eigen/modules.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 module load PrgEnv-gnu
 module load cray-python
+module load matplotlib
 module load eigen/3.4.0
-
diff --git a/exercises/9-eigen/movie.py b/exercises/9-eigen/movie.py
@@ -0,0 +1,39 @@
+import argparse
+import numpy as np
+import matplotlib.pyplot as plt
+from matplotlib.animation import FuncAnimation
+
+def plot(simulation):
+    n = 20
+    steps = 200
+
+    fig, ax = plt.subplots()
+    xdata = np.arange(0, n)
+    ydata = []
+    ln, = ax.plot([], [], 'ro')
+
+    data = np.loadtxt(f"{simulation}_sim.txt")
+
+    def init():
+        ax.set_xlim(0,n)
+        ax.set_ylim(0,1.1)
+        return ln,
+
+    def update(frame):
+        ydata = data[frame]
+        ln.set_data(xdata, ydata)
+        return ln,
+
+    ani = FuncAnimation(fig, update, frames=np.arange(0, 200),
+                        init_func=init, blit=True)
+
+    ani.save(f"{simulation}.gif", writer="pillow")
+    plt.show()
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(prog='movie.py', description='Create animation from simulation output.')
+    parser.add_argument('simulation', default='implicit', const='implicit', nargs='?', choices=['implicit', 'explicit', 'sparse'])
+
+    args = parser.parse_args()
+    plot(args.simulation)
diff --git a/exercises/eigen/sparse.cpp → exercises/9-eigen/sparse.cpp b/exercises/eigen/sparse.cpp → exercises/9-eigen/sparse.cpp
diff --git a/exercises/README.md b/exercises/README.md
@@ -7,11 +7,12 @@ See each subdirectory for further instructions
 * [2.1 Class types](2.1-class-types/)
 * [2.2 Complex numbers](2.2-complex/)
 * [3 Containers](3-containers/)
-* [4 My array](4-my_array)
-* [5 Templates](5-templates)
-* [6.1 Pointers](6.1-pointer)
-* [6.2 Special pointers](6.2-special-pointers)
-* [Morton-order matrix class template](morton-order/)
-* [Using algorithms](algorithm/)
-* [Eigen](eigen/)
-* [Simple use of threads](threads/)
+* [4 My array](4-my-array/)
+* [5 Templates](5-templates/)
+* [6.1 Pointers](6.1-pointers/)
+* [6.2 Special pointers](6.2-special-pointers/)
+* [6.3 Morton-order matrix class template](6.3-morton-order/)
+* [7 Inheritance](7-inheritance/)
+* [8 Using algorithms](8-algorithm/)
+* [9 Eigen](9-eigen/)
+* [10 Simple use of threads](10-threads/)
diff --git a/exercises/eigen/movie.py b/exercises/eigen/movie.py