From 598e9f67080b27463041d5772fa6f6369e29642d Mon Sep 17 00:00:00 2001 From: Bechir Date: Fri, 5 Apr 2024 17:05:42 +0200 Subject: [PATCH] format files --- examples/zmq_receiver_example.cpp | 2 +- file_io/include/aare/RawFile.hpp | 4 +- network_io/include/aare/ZmqHeader.hpp | 10 +- network_io/src/ZmqSocketReceiver.cpp | 2 +- network_io/test/ZmqHeader.test.cpp | 138 ++++++++++++-------------- utils/include/aare/utils/logger.hpp | 4 +- 6 files changed, 76 insertions(+), 84 deletions(-) diff --git a/examples/zmq_receiver_example.cpp b/examples/zmq_receiver_example.cpp index 72fab8e..888d640 100644 --- a/examples/zmq_receiver_example.cpp +++ b/examples/zmq_receiver_example.cpp @@ -12,7 +12,7 @@ int main() { while (true) { int rc = socket.receive(header, reinterpret_cast(data)); - aare::logger::info("Received bytes",rc,"Received header: ", header.to_string()); + aare::logger::info("Received bytes", rc, "Received header: ", header.to_string()); auto *data_int = reinterpret_cast(data); for (uint32_t i = 0; i < header.npixelsx; i++) { for (uint32_t j = 0; j < header.npixelsy; j++) { diff --git a/file_io/include/aare/RawFile.hpp b/file_io/include/aare/RawFile.hpp index b8f7b7d..f5bd4de 100644 --- a/file_io/include/aare/RawFile.hpp +++ b/file_io/include/aare/RawFile.hpp @@ -14,9 +14,7 @@ class RawFile : public FileInterface { std::filesystem::path m_fname; // TO be made private! // pragma to ignore warnings - void write(Frame &frame) override{ - throw std::runtime_error("Not implemented"); - }; + void write(Frame &frame) override { throw std::runtime_error("Not implemented"); }; Frame read() override { return get_frame(this->current_frame++); }; std::vector read(size_t n_frames) override; diff --git a/network_io/include/aare/ZmqHeader.hpp b/network_io/include/aare/ZmqHeader.hpp index c721d78..6096282 100644 --- a/network_io/include/aare/ZmqHeader.hpp +++ b/network_io/include/aare/ZmqHeader.hpp @@ -46,9 +46,11 @@ template <> simdjson_inline simdjson::simdjson_result simdjson::ondema } /** - * @brief cast a simdjson::ondemand::value to a std::map -*/ -template <> simdjson_inline simdjson::simdjson_result> simdjson::ondemand::value::get() noexcept { + * @brief cast a simdjson::ondemand::value to a std::map + */ +template <> +simdjson_inline simdjson::simdjson_result> +simdjson::ondemand::value::get() noexcept { std::map map; ondemand::object obj; auto error = get_object().get(obj); @@ -131,6 +133,6 @@ struct ZmqHeader { std::string to_string() const; void from_string(std::string &s); // compare operator - bool operator==(const ZmqHeader &other) const ; + bool operator==(const ZmqHeader &other) const; }; } // namespace aare \ No newline at end of file diff --git a/network_io/src/ZmqSocketReceiver.cpp b/network_io/src/ZmqSocketReceiver.cpp index 7d9a79b..2d395ea 100644 --- a/network_io/src/ZmqSocketReceiver.cpp +++ b/network_io/src/ZmqSocketReceiver.cpp @@ -32,7 +32,7 @@ void ZmqSocketReceiver::connect() { size_t ZmqSocketReceiver::receive(ZmqHeader &header, std::byte *data, bool serialized_header) { size_t data_bytes_received{}; - + if (serialized_header) throw std::runtime_error("Not implemented"); diff --git a/network_io/test/ZmqHeader.test.cpp b/network_io/test/ZmqHeader.test.cpp index 60eb11f..787dfb6 100644 --- a/network_io/test/ZmqHeader.test.cpp +++ b/network_io/test/ZmqHeader.test.cpp @@ -1,88 +1,80 @@ -#include #include "aare/ZmqHeader.hpp" #include "aare/utils/logger.hpp" - +#include using namespace aare; TEST_CASE("Test ZmqHeader") { ZmqHeader header; header.npixelsx = 10; header.npixelsy = 15; - header.data= 1; - header.jsonversion= 2; - header.dynamicRange= 32; - header.fileIndex= 4; - header.ndetx= 5; - header.ndety= 6; - header.imageSize= 4800; - header.acqIndex= 8; - header.frameIndex= 9; - header.progress= 0.1; - header.fname= "test"; - header.frameNumber= 11; - header.expLength= 12; - header.packetNumber= 13; - header.detSpec1= 14; - header.timestamp= 15; - header.modId= 16; - header.row= 17; - header.column= 18; - header.detSpec2= 19; - header.detSpec3= 20; - header.detSpec4= 21; - header.detType= 22; - header.version= 23; - header.flipRows= 24; - header.quad= 25; - header.completeImage= 1; - header.addJsonHeader= {{"key1", "value1"}, {"key2", "value2"}}; - header.rx_roi= {27, 28, 29, 30}; + header.data = 1; + header.jsonversion = 2; + header.dynamicRange = 32; + header.fileIndex = 4; + header.ndetx = 5; + header.ndety = 6; + header.imageSize = 4800; + header.acqIndex = 8; + header.frameIndex = 9; + header.progress = 0.1; + header.fname = "test"; + header.frameNumber = 11; + header.expLength = 12; + header.packetNumber = 13; + header.detSpec1 = 14; + header.timestamp = 15; + header.modId = 16; + header.row = 17; + header.column = 18; + header.detSpec2 = 19; + header.detSpec3 = 20; + header.detSpec4 = 21; + header.detType = 22; + header.version = 23; + header.flipRows = 24; + header.quad = 25; + header.completeImage = 1; + header.addJsonHeader = {{"key1", "value1"}, {"key2", "value2"}}; + header.rx_roi = {27, 28, 29, 30}; std::string json_header = "{" - "\"data\": 1, " - "\"jsonversion\": 2, " - "\"dynamicRange\": 32, " - "\"fileIndex\": 4, " - "\"ndetx\": 5, " - "\"ndety\": 6, " - "\"npixelsx\": 10, " - "\"npixelsy\": 15, " - "\"imageSize\": 4800, " - "\"acqIndex\": 8, " - "\"frameIndex\": 9, " - "\"progress\": 0.100000, " - "\"fname\": \"test\", " - "\"frameNumber\": 11, " - "\"expLength\": 12, " - "\"packetNumber\": 13, " - "\"detSpec1\": 14, " - "\"timestamp\": 15, " - "\"modId\": 16, " - "\"row\": 17, " - "\"column\": 18, " - "\"detSpec2\": 19, " - "\"detSpec3\": 20, " - "\"detSpec4\": 21, " - "\"detType\": 22, " - "\"version\": 23, " - "\"flipRows\": 24, " - "\"quad\": 25, " - "\"completeImage\": 1, " - "\"addJsonHeader\": {\"key1\": \"value1\", \"key2\": \"value2\"}, " - "\"rx_roi\": [27, 28, 29, 30]" - "}"; + "\"data\": 1, " + "\"jsonversion\": 2, " + "\"dynamicRange\": 32, " + "\"fileIndex\": 4, " + "\"ndetx\": 5, " + "\"ndety\": 6, " + "\"npixelsx\": 10, " + "\"npixelsy\": 15, " + "\"imageSize\": 4800, " + "\"acqIndex\": 8, " + "\"frameIndex\": 9, " + "\"progress\": 0.100000, " + "\"fname\": \"test\", " + "\"frameNumber\": 11, " + "\"expLength\": 12, " + "\"packetNumber\": 13, " + "\"detSpec1\": 14, " + "\"timestamp\": 15, " + "\"modId\": 16, " + "\"row\": 17, " + "\"column\": 18, " + "\"detSpec2\": 19, " + "\"detSpec3\": 20, " + "\"detSpec4\": 21, " + "\"detType\": 22, " + "\"version\": 23, " + "\"flipRows\": 24, " + "\"quad\": 25, " + "\"completeImage\": 1, " + "\"addJsonHeader\": {\"key1\": \"value1\", \"key2\": \"value2\"}, " + "\"rx_roi\": [27, 28, 29, 30]" + "}"; - SECTION("Test converting ZmqHeader to json string"){ - REQUIRE(header.to_string() == json_header); - - } - SECTION("Test converting json string to ZmqHeader"){ + SECTION("Test converting ZmqHeader to json string") { REQUIRE(header.to_string() == json_header); } + SECTION("Test converting json string to ZmqHeader") { ZmqHeader header2; header2.from_string(json_header); - REQUIRE(header2== header); + REQUIRE(header2 == header); } - - - - } diff --git a/utils/include/aare/utils/logger.hpp b/utils/include/aare/utils/logger.hpp index 80a1500..87928bf 100644 --- a/utils/include/aare/utils/logger.hpp +++ b/utils/include/aare/utils/logger.hpp @@ -2,8 +2,8 @@ #include #include #include -#include #include +#include #define LOCATION std::string(__FILE__) + std::string(":") + std::to_string(__LINE__) + ":" + std::string(__func__) + ":" @@ -38,7 +38,7 @@ template std::ostream &operator<<(std::ostream &out, co out << "{"; size_t i = 0; for (auto &kv : v) { - out << kv.first << ": " << kv.second << ((++i!=v.size())?", ":""); + out << kv.first << ": " << kv.second << ((++i != v.size()) ? ", " : ""); } out << "}";