Skip to content

Commit 52b7a60

Browse files
eschnetteschnett
committed
Reformat code
1 parent 854c6f3 commit 52b7a60

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+415
-404
lines changed

‎adt/arith.hpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ namespace detail {
1515
template <typename> struct is_std_array : std::false_type {};
1616
template <typename T, std::size_t N>
1717
struct is_std_array<std::array<T, N>> : std::true_type {};
18-
}
18+
} // namespace detail
1919

2020
namespace detail {
2121
// See also detail::is_vector in <fun/vector.hpp>
2222
template <typename> struct is_vector : std::false_type {};
2323
template <typename T, typename Allocator>
2424
struct is_vector<std::vector<T, Allocator>> : std::true_type {};
25-
}
26-
}
25+
} // namespace detail
26+
} // namespace adt
2727

2828
namespace std {
2929

@@ -84,7 +84,7 @@ MAKEOP(/)
8484
MAKEOP(%)
8585
MAKEOP(&)
8686
MAKEOP(|)
87-
MAKEOP (^)
87+
MAKEOP(^)
8888
MAKEOP(<<)
8989
MAKEOP(>>)
9090
MAKEOP(&&)
@@ -187,7 +187,7 @@ MAKEOP(/)
187187
MAKEOP(%)
188188
MAKEOP(&)
189189
MAKEOP(|)
190-
MAKEOP (^)
190+
MAKEOP(^)
191191
MAKEOP(<<)
192192
MAKEOP(>>)
193193
MAKEOP(&&)
@@ -229,7 +229,7 @@ MAKEOP(^=)
229229
MAKEOP(<<=)
230230
MAKEOP(>>=)
231231
#undef MAKEOP
232-
}
232+
} // namespace std
233233

234234
namespace adt {
235235

@@ -614,7 +614,7 @@ MAKELIM(float)
614614
MAKELIM(double)
615615
MAKELIM(long double)
616616
#undef MAKELIM
617-
}
617+
} // namespace detail
618618

619619
#define MAKEREDOP(name, op, z) \
620620
template <typename T, std::size_t N, \
@@ -645,7 +645,7 @@ MAKEREDOP(any, ||, false)
645645
MAKEREDFUN(maxval, std::max, detail::numeric_limits<R>::min())
646646
MAKEREDFUN(minval, std::min, detail::numeric_limits<R>::max())
647647
#undef MAKEREDFUN
648-
}
648+
} // namespace adt
649649

650650
namespace std {
651651
template <typename T, std::size_t N>
@@ -669,7 +669,7 @@ std::string to_string(const std::array<T, N> &x) {
669669
os << x;
670670
return std::move(os).str();
671671
}
672-
}
672+
} // namespace std
673673

674674
#define ADT_ARITH_HPP_DONE
675675
#endif // #ifdef ADT_ARITH_HPP

‎adt/dummy.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ struct dummy {
88
template <typename Archive> void serialize(Archive &ar) { ar(); }
99
};
1010
inline void swap(dummy &x, dummy &y) {}
11-
}
11+
} // namespace adt
1212

1313
#define ADT_DUMMY_HPP_DONE
1414
#endif // #ifdef ADT_DUMMY_HPP

‎adt/either.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ template <typename L, typename R, typename... Args>
201201
either<L, R> make_right(Args &&... args) {
202202
return either<L, R>::make_right(std::forward<Args>(args)...);
203203
}
204-
}
204+
} // namespace adt
205205

206206
#define ADT_EITHER_HPP_DONE
207207
#endif // #ifdef ADT_EITHER_HPP

‎adt/either_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ template <typename T> void test_serialize(const T &x) {
122122
}
123123
EXPECT_EQ(x, y);
124124
}
125-
}
125+
} // namespace
126126

127127
TEST(adt_either, serialize) {
128128
test_serialize(adt::make_left<int, double>(1));

‎adt/empty.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ template <typename T> class empty {
2121
bool operator>=(const empty &other) const { return !(*this < other); }
2222
};
2323
template <typename T> void swap(empty<T> &x, empty<T> &y) { x.swap(y); }
24-
}
24+
} // namespace adt
2525

2626
#define ADT_EMPTY_HPP_DONE
2727
#endif // #ifdef ADT_EMPTY_HPP

‎adt/extra.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ template <typename E, typename T> class extra {
3232
template <typename E, typename T> void swap(extra<E, T> &x, extra<E, T> &y) {
3333
x.swap(y);
3434
}
35-
}
35+
} // namespace adt
3636

3737
#define ADT_EXTRA_HPP_DONE
3838
#endif // #ifdef ADT_EXTRA_HPP

‎adt/grid2_decl.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace adt {
88
template <typename C, typename T, std::size_t D> class grid2;
99
template <typename C, typename T, std::size_t D>
1010
void swap(grid2<C, T, D> &x, grid2<C, T, D> &y);
11-
}
11+
} // namespace adt
1212

1313
#define ADT_GRID2_DECL_HPP_DONE
1414
#endif // #ifdef ADT_GRID2_DECL_HPP

‎adt/grid2_impl.hpp

+8-7
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,13 @@ template <typename C, typename T, std::size_t D> class grid2 {
109109
template <typename F, typename... Args, std::size_t D1 = D,
110110
std::enable_if_t<D1 == 1> * = nullptr>
111111
grid2(iotaMap, F &&f, const adt::irange_t &inds, Args &&... args)
112-
: grid2(iotaMap(),
113-
[&](const index_type &ipos) {
114-
return cxx::invoke(std::forward<F>(f), ipos[0],
115-
std::forward<Args>(args)...);
116-
},
117-
adt::range_t<D>(inds)) {}
112+
: grid2(
113+
iotaMap(),
114+
[&](const index_type &ipos) {
115+
return cxx::invoke(std::forward<F>(f), ipos[0],
116+
std::forward<Args>(args)...);
117+
},
118+
adt::range_t<D>(inds)) {}
118119

119120
template <typename F, typename... Args>
120121
grid2(iotaMap, F &&f, const adt::range_t<D> &inds, Args &&... args)
@@ -295,7 +296,7 @@ template <typename C, typename T, std::size_t D>
295296
void swap(grid2<C, T, D> &x, grid2<C, T, D> &y) {
296297
x.swap(y);
297298
}
298-
}
299+
} // namespace adt
299300

300301
#define ADT_GRID2_IMPL_HPP_DONE
301302
#endif // #ifdef ADT_GRID2_IMPL_HPP

‎adt/grid2_test.cpp

+67-62
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@ TEST(adt_grid2, basic) {
3131
}
3232

3333
TEST(adt_grid2, iotaMap_simple) {
34-
auto g1 =
35-
vgrid<double, 1>(typename vgrid<double, 1>::iotaMap(),
36-
[](auto i) { return double(i); }, adt::irange_t(10));
34+
auto g1 = vgrid<double, 1>(
35+
typename vgrid<double, 1>::iotaMap(), [](auto i) { return double(i); },
36+
adt::irange_t(10));
3737
EXPECT_EQ(9.0, g1.last());
3838
}
3939

4040
namespace {
4141
template <std::size_t D> void test_iotaMap() {
4242
std::ptrdiff_t s = std::lrint(std::fmax(2.0, std::pow(1000.0, 1.0 / D)));
43-
auto g = vgrid<double, D>(typename vgrid<double, D>::iotaMap(),
44-
[](auto i) { return double(adt::sum(i)); },
45-
adt::set<adt::index_t<D>>(s));
43+
auto g = vgrid<double, D>(
44+
typename vgrid<double, D>::iotaMap(),
45+
[](auto i) { return double(adt::sum(i)); }, adt::set<adt::index_t<D>>(s));
4646
EXPECT_EQ(D * double(s - 1), g.last());
4747
}
48-
}
48+
} // namespace
4949

5050
TEST(adt_grid2, iotaMap) {
5151
test_iotaMap<0>();
@@ -58,14 +58,14 @@ TEST(adt_grid2, iotaMap) {
5858
namespace {
5959
template <std::size_t D> void test_fmap() {
6060
std::ptrdiff_t s = std::lrint(std::fmax(2.0, std::pow(1000.0, 1.0 / D)));
61-
auto g = vgrid<double, D>(typename vgrid<double, D>::iotaMap(),
62-
[](auto i) { return double(adt::sum(i)); },
63-
adt::set<adt::index_t<D>>(s));
64-
auto x = vgrid<double, D>(typename vgrid<double, D>::fmap(),
65-
[](auto x) { return 2 * x + 1; }, g);
61+
auto g = vgrid<double, D>(
62+
typename vgrid<double, D>::iotaMap(),
63+
[](auto i) { return double(adt::sum(i)); }, adt::set<adt::index_t<D>>(s));
64+
auto x = vgrid<double, D>(
65+
typename vgrid<double, D>::fmap(), [](auto x) { return 2 * x + 1; }, g);
6666
EXPECT_EQ(2 * (D * double(s - 1)) + 1, x.last());
6767
}
68-
}
68+
} // namespace
6969

7070
TEST(adt_grid2, fmap) {
7171
test_fmap<0>();
@@ -78,16 +78,17 @@ TEST(adt_grid2, fmap) {
7878
namespace {
7979
template <std::size_t D> void test_fmap2() {
8080
std::ptrdiff_t s = std::lrint(std::fmax(2.0, std::pow(1000.0, 1.0 / D)));
81-
auto g = vgrid<double, D>(typename vgrid<double, D>::iotaMap(),
82-
[](auto i) { return double(adt::sum(i)); },
83-
adt::set<adt::index_t<D>>(s));
84-
auto x = vgrid<double, D>(typename vgrid<double, D>::fmap(),
85-
[](auto x) { return 2 * x + 1; }, g);
86-
auto y = vgrid<double, D>(typename vgrid<double, D>::fmap2(),
87-
[](auto x, auto y) { return x + y; }, g, x);
81+
auto g = vgrid<double, D>(
82+
typename vgrid<double, D>::iotaMap(),
83+
[](auto i) { return double(adt::sum(i)); }, adt::set<adt::index_t<D>>(s));
84+
auto x = vgrid<double, D>(
85+
typename vgrid<double, D>::fmap(), [](auto x) { return 2 * x + 1; }, g);
86+
auto y = vgrid<double, D>(
87+
typename vgrid<double, D>::fmap2(), [](auto x, auto y) { return x + y; },
88+
g, x);
8889
EXPECT_EQ(3 * (D * double(s - 1)) + 1, y.last());
8990
}
90-
}
91+
} // namespace
9192

9293
TEST(adt_grid2, fmap2) {
9394
test_fmap2<0>();
@@ -100,19 +101,20 @@ TEST(adt_grid2, fmap2) {
100101
namespace {
101102
template <std::size_t D> void test_fmap3() {
102103
std::ptrdiff_t s = std::lrint(std::fmax(2.0, std::pow(1000.0, 1.0 / D)));
103-
auto g = vgrid<double, D>(typename vgrid<double, D>::iotaMap(),
104-
[](auto i) { return double(adt::sum(i)); },
105-
adt::set<adt::index_t<D>>(s));
106-
auto x = vgrid<double, D>(typename vgrid<double, D>::fmap(),
107-
[](auto x) { return 2 * x + 1; }, g);
108-
auto y = vgrid<double, D>(typename vgrid<double, D>::fmap2(),
109-
[](auto x, auto y) { return x + y; }, g, x);
110-
auto z = vgrid<double, D>(typename vgrid<double, D>::fmap3(),
111-
[](auto x, auto y, auto z) { return x + y + z; }, g,
112-
x, y);
104+
auto g = vgrid<double, D>(
105+
typename vgrid<double, D>::iotaMap(),
106+
[](auto i) { return double(adt::sum(i)); }, adt::set<adt::index_t<D>>(s));
107+
auto x = vgrid<double, D>(
108+
typename vgrid<double, D>::fmap(), [](auto x) { return 2 * x + 1; }, g);
109+
auto y = vgrid<double, D>(
110+
typename vgrid<double, D>::fmap2(), [](auto x, auto y) { return x + y; },
111+
g, x);
112+
auto z = vgrid<double, D>(
113+
typename vgrid<double, D>::fmap3(),
114+
[](auto x, auto y, auto z) { return x + y + z; }, g, x, y);
113115
EXPECT_EQ(6 * (D * double(s - 1)) + 2, z.last());
114116
}
115-
}
117+
} // namespace
116118

117119
TEST(adt_grid2, fmap3) {
118120
test_fmap3<0>();
@@ -125,9 +127,9 @@ TEST(adt_grid2, fmap3) {
125127
namespace {
126128
template <std::size_t D> void test_boundary() {
127129
std::ptrdiff_t s = std::lrint(std::fmax(2.0, std::pow(1000.0, 1.0 / D)));
128-
auto g = vgrid<double, D>(typename vgrid<double, D>::iotaMap(),
129-
[](auto i) { return double(adt::sum(i)); },
130-
adt::set<adt::index_t<D>>(s));
130+
auto g = vgrid<double, D>(
131+
typename vgrid<double, D>::iotaMap(),
132+
[](auto i) { return double(adt::sum(i)); }, adt::set<adt::index_t<D>>(s));
131133
for (int f = 0; f < 2; ++f) {
132134
for (int d = 0; d < int(D); ++d) {
133135
auto bs =
@@ -143,7 +145,7 @@ template <std::size_t D> void test_boundary() {
143145
}
144146
}
145147
}
146-
}
148+
} // namespace
147149

148150
TEST(adt_grid2, boundary) {
149151
test_boundary<1>();
@@ -155,9 +157,9 @@ TEST(adt_grid2, boundary) {
155157
namespace {
156158
template <std::size_t D> void test_fmapStencil() {
157159
std::ptrdiff_t s = std::lrint(std::fmax(2.0, std::pow(1000.0, 1.0 / D)));
158-
auto g = vgrid<double, D>(typename vgrid<double, D>::iotaMap(),
159-
[](auto i) { return double(adt::sum(i)); },
160-
adt::set<adt::index_t<D>>(s));
160+
auto g = vgrid<double, D>(
161+
typename vgrid<double, D>::iotaMap(),
162+
[](auto i) { return double(adt::sum(i)); }, adt::set<adt::index_t<D>>(s));
161163
std::array<std::array<vgrid<double, D>, D>, 2> bss;
162164
for (int f = 0; f < 2; ++f) {
163165
for (int d = 0; d < int(D); ++d) {
@@ -170,32 +172,35 @@ template <std::size_t D> void test_fmapStencil() {
170172
bmin[d] = s;
171173
bmax[d] = s + 1;
172174
}
173-
bss[f][d] = vgrid<double, D>(typename vgrid<double, D>::iotaMap(),
174-
[](auto i) { return double(adt::sum(i)); },
175-
adt::range_t<D>(bmin, bmax));
175+
bss[f][d] = vgrid<double, D>(
176+
typename vgrid<double, D>::iotaMap(),
177+
[](auto i) { return double(adt::sum(i)); },
178+
adt::range_t<D>(bmin, bmax));
176179
}
177180
}
178-
auto x = vgrid<double, D>(typename vgrid<double, D>::fmapStencil(),
179-
[](auto x, auto bs) {
180-
auto r = x;
181-
r = 0;
182-
for (int d = 0; d < int(D); ++d)
183-
r += bs[0][d] - 2 * x + bs[1][d];
184-
return r;
185-
},
186-
[](auto x, auto f, auto d) { return x; }, g, bss);
181+
auto x = vgrid<double, D>(
182+
typename vgrid<double, D>::fmapStencil(),
183+
[](auto x, auto bs) {
184+
auto r = x;
185+
r = 0;
186+
for (int d = 0; d < int(D); ++d)
187+
r += bs[0][d] - 2 * x + bs[1][d];
188+
return r;
189+
},
190+
[](auto x, auto f, auto d) { return x; }, g, bss);
187191
EXPECT_EQ(x.size(), g.size());
188192
EXPECT_EQ(x.active(), g.active());
189193
double maxabs = 0.0;
190-
vgrid<std::tuple<>, D>(typename vgrid<std::tuple<>, D>::fmap(),
191-
[&](auto x) {
192-
maxabs = std::fmax(maxabs, std::fabs(x));
193-
return std::tuple<>();
194-
},
195-
x);
194+
vgrid<std::tuple<>, D>(
195+
typename vgrid<std::tuple<>, D>::fmap(),
196+
[&](auto x) {
197+
maxabs = std::fmax(maxabs, std::fabs(x));
198+
return std::tuple<>();
199+
},
200+
x);
196201
EXPECT_EQ(0.0, maxabs);
197202
}
198-
}
203+
} // namespace
199204

200205
TEST(adt_grid2, fmapStencil) {
201206
test_fmapStencil<0>();
@@ -208,15 +213,15 @@ TEST(adt_grid2, fmapStencil) {
208213
namespace {
209214
template <std::size_t D> void test_foldMap() {
210215
std::ptrdiff_t s = std::lrint(std::fmax(2.0, std::pow(1000.0, 1.0 / D)));
211-
auto g = vgrid<double, D>(typename vgrid<double, D>::iotaMap(),
212-
[](auto x) { return double(adt::sum(x)); },
213-
adt::set<adt::index_t<D>>(s));
216+
auto g = vgrid<double, D>(
217+
typename vgrid<double, D>::iotaMap(),
218+
[](auto x) { return double(adt::sum(x)); }, adt::set<adt::index_t<D>>(s));
214219
auto r = g.foldMap([](auto x) { return x; },
215220
[](auto x, auto y) { return x + y; }, 0.0);
216221
EXPECT_TRUE((std::is_same<decltype(r), double>::value));
217222
EXPECT_EQ(D == 0 ? 0 : D * std::pow(s, D - 1) * s * (s - 1) / 2, r);
218223
}
219-
}
224+
} // namespace
220225

221226
TEST(adt_grid2, foldMap) {
222227
test_foldMap<0>();

‎adt/grid_decl.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace adt {
88
template <typename C, typename T, std::size_t D> class grid;
99
template <typename C, typename T, std::size_t D>
1010
void swap(grid<C, T, D> &x, grid<C, T, D> &y);
11-
}
11+
} // namespace adt
1212

1313
#define ADT_GRID_DECL_HPP_DONE
1414
#endif // #ifdef ADT_GRID_DECL_HPP

0 commit comments

Comments
 (0)