Skip to content

Commit 02362db

Browse files
committed
hard disagree on this linting nonsense
1 parent f459cce commit 02362db

File tree

3 files changed

+13
-26
lines changed

3 files changed

+13
-26
lines changed

cpp/purify/h5reader.h

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,20 @@ namespace purify {
1313

1414
/// @brief Purify interface class to handle HDF5 input files
1515
class H5Handler {
16-
public:
17-
16+
public:
1817
H5Handler() = delete;
1918

20-
H5Handler(const std::string& filename)
21-
: _file(filename) { }
19+
H5Handler(const std::string& filename) : _file(filename) {}
2220

2321
template <typename T = double>
2422
std::vector<T> read(const std::string& label) {
2523
auto dataset = _file.getDataSet(label);
2624
return dataset.read<std::vector<T>>();
2725
}
2826

29-
private:
30-
31-
/// HDF5 file
32-
const HighFive::File _file;
33-
27+
private:
28+
/// HDF5 file
29+
const HighFive::File _file;
3430
};
3531

3632
} // namespace purify

cpp/purify/uvw_utilities.cc

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
#include <fstream>
44
#include <random>
55
#include <sys/stat.h>
6+
#include "purify/h5reader.h"
67
#include "purify/logging.h"
78
#include "purify/operators.h"
8-
#include "purify/h5reader.h"
99

1010
namespace purify {
1111
namespace utilities {
1212

1313
bool has_suffix(const std::string &str, const std::string &suff) {
14-
return str.size() >= suff.size() &&
15-
str.compare(str.size() - suff.size(), suff.size(), suff) == 0;
14+
return str.size() >= suff.size() && str.compare(str.size() - suff.size(), suff.size(), suff) == 0;
1615
}
1716

1817
Matrix<t_real> generate_antennas(const t_uint N, const t_real scale) {
@@ -247,8 +246,7 @@ utilities::vis_params read_visibility_h5(const std::string &vis_name, const bool
247246
if (w_term) {
248247
std::vector<t_real> wtemp = vis_file.read<t_real>("w");
249248
uv_vis.w = Eigen::Map<Vector<t_real>>(wtemp.data(), wtemp.size(), 1);
250-
}
251-
else {
249+
} else {
252250
uv_vis.w = Vector<t_real>::Zero(utemp.size());
253251
}
254252

@@ -259,7 +257,7 @@ utilities::vis_params read_visibility_h5(const std::string &vis_name, const bool
259257

260258
uv_vis.vis = Vector<t_complex>::Zero(retemp.size());
261259
uv_vis.weights = Vector<t_complex>::Zero(retemp.size());
262-
for (size_t i=0; i<retemp.size(); ++i) {
260+
for (size_t i = 0; i < retemp.size(); ++i) {
263261
uv_vis.vis(i) = t_complex(retemp[i], imtemp[i]);
264262
uv_vis.weights(i) = 1 / sigma[i];
265263
}
@@ -272,9 +270,8 @@ utilities::vis_params read_visibility_h5(const std::string &vis_name, const bool
272270
}
273271

274272
utilities::vis_params read_visibility(const std::string &vis_name, const bool w_term) {
275-
276-
if ( has_suffix(vis_name, ".h5") ) return read_visibility_h5(vis_name, w_term);
277-
return read_visibility_csv(vis_name, w_term);
273+
if (has_suffix(vis_name, ".h5")) return read_visibility_h5(vis_name, w_term);
274+
return read_visibility_csv(vis_name, w_term);
278275
}
279276

280277
void write_visibility(const utilities::vis_params &uv_vis, const std::string &file_name,

cpp/tests/purify_h5.cc

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ using namespace purify;
1414
using namespace purify::notinstalled;
1515

1616
TEST_CASE("Purify H5", "[HDF5]") {
17-
1817
H5Handler f(atca_filename("0332-391.h5"));
1918

2019
const std::vector<double> u = f.read("u");
@@ -31,12 +30,7 @@ TEST_CASE("Purify H5", "[HDF5]") {
3130
std::cout << "im size = " << im.size() << std::endl;
3231
std::cout << "sigma size = " << sigma.size() << std::endl;
3332

34-
const bool pass = u.size() > 0 && \
35-
u.size() == v.size() && \
36-
u.size() == w.size() && \
37-
u.size() == re.size() && \
38-
u.size() == im.size() && \
39-
u.size() == sigma.size();
33+
const bool pass = u.size() > 0 && u.size() == v.size() && u.size() == w.size() &&
34+
u.size() == re.size() && u.size() == im.size() && u.size() == sigma.size();
4035
CHECK(pass);
4136
}
42-

0 commit comments

Comments
 (0)