Skip to content

Commit 26476e5

Browse files
committed
Remove need for common view in exercise 2
1 parent 18c8a34 commit 26476e5

File tree

5 files changed

+594
-37
lines changed

5 files changed

+594
-37
lines changed

labs/lab2_heat/exercise2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ double stencil(double *u_new, double *u_old, long x, long y, parameters p) {
244244
double apply_stencil(double* u_new, double* u_old, grid g, parameters p) {
245245
auto xs = std::views::iota(g.x_begin, g.x_end);
246246
auto ys = std::views::iota(g.y_begin, g.y_end);
247-
auto ids = std::views::common(std::views::cartesian_product(xs, ys));
247+
auto ids = std::views::cartesian_product(xs, ys);
248248
return std::transform_reduce(
249249
std::execution::par, ids.begin(), ids.end(),
250250
0., std::plus{}, [u_new, u_old, p](auto idx) {

labs/lab2_heat/heat.ipynb

Lines changed: 590 additions & 33 deletions
Large diffs are not rendered by default.

labs/lab2_heat/solutions/exercise1.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ struct grid {
6363
double apply_stencil(double* u_new, double* u_old, grid g, parameters p) {
6464
auto xs = std::views::iota(g.x_begin, g.x_end);
6565
auto ys = std::views::iota(g.y_begin, g.y_end);
66-
auto ids = std::views::common(std::views::cartesian_product(xs, ys));
66+
auto ids = std::views::cartesian_product(xs, ys);
6767
return std::transform_reduce(
6868
std::execution::par, ids.begin(), ids.end(),
6969
0., std::plus{}, [u_new, u_old, p](auto idx) {

labs/lab2_heat/solutions/exercise2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ double stencil(double *u_new, double *u_old, long x, long y, parameters p) {
241241
double apply_stencil(double* u_new, double* u_old, grid g, parameters p) {
242242
auto xs = std::views::iota(g.x_begin, g.x_end);
243243
auto ys = std::views::iota(g.y_begin, g.y_end);
244-
auto ids = std::views::common(std::views::cartesian_product(xs, ys));
244+
auto ids = std::views::cartesian_product(xs, ys);
245245
return std::transform_reduce(
246246
std::execution::par, ids.begin(), ids.end(),
247247
0., std::plus{}, [u_new, u_old, p](auto idx) {

labs/lab2_heat/solutions/exercise3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ double stencil(double *u_new, double *u_old, long x, long y, parameters p) {
211211
double apply_stencil(double* u_new, double* u_old, grid g, parameters p) {
212212
auto xs = std::views::iota(g.x_begin, g.x_end);
213213
auto ys = std::views::iota(g.y_begin, g.y_end);
214-
auto ids = std::views::common(std::views::cartesian_product(xs, ys));
214+
auto ids = std::views::cartesian_product(xs, ys);
215215
return std::transform_reduce(
216216
std::execution::par, ids.begin(), ids.end(),
217217
0., std::plus{}, [u_new, u_old, p](auto idx) {

0 commit comments

Comments
 (0)