From ac5dfba32f449fb0fab90f5f17d124b5e3ceaf42 Mon Sep 17 00:00:00 2001 From: Pietro Bortolus <Pietro.bortolus@skywarder.eu> Date: Thu, 5 Dec 2024 22:16:57 +0100 Subject: [PATCH] Formatted the code to comply with pipeline, this time with clang-format-14 --- src/entrypoints/kernel-testsuite.cpp | 4 +- src/entrypoints/sx1278-serial.cpp | 16 +- src/shared/ActiveObject.h | 2 +- src/shared/algorithms/Follower/FollowerData.h | 10 +- src/shared/algorithms/MEA/MEA.cpp | 7 +- src/shared/algorithms/ReferenceValues.h | 2 +- src/shared/drivers/adc/InternalADC.cpp | 6 +- src/shared/events/EventHandler.h | 4 +- src/shared/events/HSM.h | 2 +- src/shared/events/utils/EventCounter.h | 2 +- src/shared/sensors/ADS1118/ADS1118.h | 16 +- src/shared/sensors/BMP280/BMP280Data.h | 4 +- .../sensors/H3LIS331DL/H3LIS331DLData.h | 6 +- src/shared/sensors/HILSensor.h | 4 +- src/shared/sensors/LPS22DF/LPS22DFData.h | 4 +- src/shared/sensors/LPS331AP/LPS331APData.h | 5 +- src/shared/sensors/MS5803/MS5803Data.h | 5 +- .../sensors/Vectornav/VN100/VN100SerialData.h | 4 +- .../sensors/Vectornav/VN100/VN100SpiData.h | 4 +- .../sensors/Vectornav/VN300/VN300Data.h | 4 +- .../sensors/analog/TrafagPressureSensor.h | 4 +- .../sensors/analog/TwoPointAnalogLoadCell.h | 4 +- src/shared/utils/CSVReader/CSVReader.h | 3 +- .../catch/propagator/test-propagator-data.h | 600 +++++++++--------- src/tests/catch/test-modulemanager.cpp | 2 +- src/tests/catch/test-sensormanager-catch.cpp | 50 +- 26 files changed, 389 insertions(+), 385 deletions(-) diff --git a/src/entrypoints/kernel-testsuite.cpp b/src/entrypoints/kernel-testsuite.cpp index 2a0275672..d78e82416 100644 --- a/src/entrypoints/kernel-testsuite.cpp +++ b/src/entrypoints/kernel-testsuite.cpp @@ -2833,8 +2833,8 @@ void __attribute__((noinline)) check32(unsigned int a, unsigned int b) fail("swapBytes32"); } -void __attribute__((noinline)) check64(unsigned long long a, - unsigned long long b) +void __attribute__((noinline)) +check64(unsigned long long a, unsigned long long b) { if (swapBytes64(a) != b) fail("swapBytes64"); diff --git a/src/entrypoints/sx1278-serial.cpp b/src/entrypoints/sx1278-serial.cpp index 073943bdb..ede273cb2 100644 --- a/src/entrypoints/sx1278-serial.cpp +++ b/src/entrypoints/sx1278-serial.cpp @@ -78,8 +78,8 @@ using sck = radio::sck; using miso = radio::miso; using mosi = radio::mosi; -using txen = radio::txEn; -using rxen = radio::rxEn; +using txen = radio::txEn; +using rxen = radio::rxEn; #define SX1278_SPI SPI4 @@ -239,11 +239,11 @@ int main() #elif defined SX1278_IS_SKYWARD433 printf("[sx1278] Confuring Skyward 433 frontend...\n"); std::unique_ptr<Boardcore::SX1278::ISX1278Frontend> frontend( - new Boardcore::Skyward433Frontend()); + new Boardcore::Skyward433Frontend()); #else printf("[sx1278] Confuring RA01 frontend...\n"); std::unique_ptr<Boardcore::SX1278::ISX1278Frontend> frontend( - new Boardcore::RA01Frontend()); + new Boardcore::RA01Frontend()); #endif #ifdef SX1278_IS_LORA @@ -273,14 +273,14 @@ int main() config.enable_crc = false; sx1278 = new Boardcore::SX1278Fsk(sx1278_bus, cs::getPin(), dio0::getPin(), - dio1::getPin(), dio3::getPin(), - Boardcore::SPI::ClockDivider::DIV_256, - std::move(frontend)); + dio1::getPin(), dio3::getPin(), + Boardcore::SPI::ClockDivider::DIV_256, + std::move(frontend)); printf("\n[sx1278] Configuring sx1278 fsk...\n"); if ((err = sx1278->init(config)) != Boardcore::SX1278Fsk::Error::NONE) { - // FIXME: Why does clang-format put this line up here? + // FIXME: Why does clang-format put this line up here? printf("[sx1278] sx1278->init error\n"); return false; } diff --git a/src/shared/ActiveObject.h b/src/shared/ActiveObject.h index e17ec5bbe..abecefa32 100644 --- a/src/shared/ActiveObject.h +++ b/src/shared/ActiveObject.h @@ -48,7 +48,7 @@ public: ActiveObject(unsigned int stacksize = miosix::STACK_DEFAULT_FOR_PTHREAD, miosix::Priority priority = miosix::MAIN_PRIORITY); - virtual ~ActiveObject() {}; + virtual ~ActiveObject(){}; /** * @brief Start the thread associated with this active object. diff --git a/src/shared/algorithms/Follower/FollowerData.h b/src/shared/algorithms/Follower/FollowerData.h index d8e2c9df0..e30123af7 100644 --- a/src/shared/algorithms/Follower/FollowerData.h +++ b/src/shared/algorithms/Follower/FollowerData.h @@ -48,10 +48,10 @@ struct AntennaAngles AntennaAngles() : timestamp{0}, yaw{0}, pitch{0} {}; AntennaAngles(uint64_t timestamp, float yaw, float pitch) - : timestamp{timestamp}, yaw(yaw), pitch(pitch) {}; + : timestamp{timestamp}, yaw(yaw), pitch(pitch){}; AntennaAngles(uint64_t timestamp, float yaw, float pitch, uint32_t nrPropagations) - : timestamp{timestamp}, yaw(yaw), pitch(pitch) {}; + : timestamp{timestamp}, yaw(yaw), pitch(pitch){}; }; /** @@ -62,13 +62,13 @@ struct AntennaAnglesLog : public AntennaAngles uint32_t nrPropagations = 0; //!< Nr of propagations by the propagator (0 if no propagation) - AntennaAnglesLog() : AntennaAngles(), nrPropagations(0) {}; + AntennaAnglesLog() : AntennaAngles(), nrPropagations(0){}; AntennaAnglesLog(uint64_t timestamp, float yaw, float pitch) : AntennaAngles(timestamp, yaw, pitch), nrPropagations{0} {}; AntennaAnglesLog(uint64_t timestamp, float yaw, float pitch, uint32_t nrPropagations) - : AntennaAngles(timestamp, yaw, pitch), - nrPropagations{nrPropagations} {}; + : AntennaAngles(timestamp, yaw, pitch), nrPropagations{ + nrPropagations} {}; AntennaAnglesLog(AntennaAngles angle, uint32_t nrPropagations) : AntennaAngles(angle), nrPropagations{nrPropagations} {}; diff --git a/src/shared/algorithms/MEA/MEA.cpp b/src/shared/algorithms/MEA/MEA.cpp index 4ea49dcf2..0b4108a07 100644 --- a/src/shared/algorithms/MEA/MEA.cpp +++ b/src/shared/algorithms/MEA/MEA.cpp @@ -63,9 +63,10 @@ MEA::MEA(const Config &config) baroR{config.baroR}, P{config.P}, x{0, 0, config.initialMass}, mass{config.initialMass}, accelThresh{config.accelThresh}, speedThresh{config.speedThresh}, Kt{config.Kt}, alpha{config.alpha}, - c{config.c}, coeffs{config.coeffs}, crossSection{config.crossSection}, - ae{config.ae}, p0{config.p0}, minMass{config.minMass}, - maxMass{config.maxMass}, cdCorrectionFactor(config.cdCorrectionFactor) + c{config.c}, coeffs{config.coeffs}, + crossSection{config.crossSection}, ae{config.ae}, p0{config.p0}, + minMass{config.minMass}, maxMass{config.maxMass}, + cdCorrectionFactor(config.cdCorrectionFactor) { updateState(); } diff --git a/src/shared/algorithms/ReferenceValues.h b/src/shared/algorithms/ReferenceValues.h index d4141ab6d..62dcddd50 100644 --- a/src/shared/algorithms/ReferenceValues.h +++ b/src/shared/algorithms/ReferenceValues.h @@ -46,7 +46,7 @@ struct ReferenceValues float mslPressure = Constants::MSL_PRESSURE; float mslTemperature = Constants::MSL_TEMPERATURE; - ReferenceValues() {}; + ReferenceValues(){}; ReferenceValues(float altitude, float pressure, float temperature, float refLatitude = Constants::B21_LATITUDE, diff --git a/src/shared/drivers/adc/InternalADC.cpp b/src/shared/drivers/adc/InternalADC.cpp index 75f26d3df..f5dbbe0af 100644 --- a/src/shared/drivers/adc/InternalADC.cpp +++ b/src/shared/drivers/adc/InternalADC.cpp @@ -39,9 +39,9 @@ static const float CAL_V_DDA = 3.3f; #elif defined(STM32F767xx) || defined(STM32F769xx) || defined(STM32F756xx) #define CAL_PT1_VALUE ((uint16_t volatile *)((uint32_t)0x1FF0F44C)) #define CAL_PT2_VALUE ((uint16_t volatile *)((uint32_t)0x1FF0F44E)) -static const float CAL_PT1_TEMP = 30; -static const float CAL_PT2_TEMP = 110; -static const float CAL_V_DDA = 3.3f; +static const float CAL_PT1_TEMP = 30; +static const float CAL_PT2_TEMP = 110; +static const float CAL_V_DDA = 3.3f; #else #warning This micro controller does not have a calibrated temperature sensor or is not currently supported by this driver #endif diff --git a/src/shared/events/EventHandler.h b/src/shared/events/EventHandler.h index 30b0fba72..eeb30eefc 100644 --- a/src/shared/events/EventHandler.h +++ b/src/shared/events/EventHandler.h @@ -36,7 +36,7 @@ class EventHandlerBase public: EventHandlerBase() {} - virtual ~EventHandlerBase() {}; + virtual ~EventHandlerBase(){}; virtual void postEvent(const Event& ev) = 0; }; @@ -67,7 +67,7 @@ inline EventHandler::EventHandler(unsigned int stacksize, { } -inline EventHandler::~EventHandler() {}; +inline EventHandler::~EventHandler(){}; inline void EventHandler::postEvent(const Event& ev) { eventList.put(ev); } diff --git a/src/shared/events/HSM.h b/src/shared/events/HSM.h index 2e7ae7ae7..59d1b95e8 100644 --- a/src/shared/events/HSM.h +++ b/src/shared/events/HSM.h @@ -66,7 +66,7 @@ public: temp = initialState; } - virtual ~HSM() {}; + virtual ~HSM(){}; bool start() override { diff --git a/src/shared/events/utils/EventCounter.h b/src/shared/events/utils/EventCounter.h index 69c6a6920..9f0914d26 100644 --- a/src/shared/events/utils/EventCounter.h +++ b/src/shared/events/utils/EventCounter.h @@ -93,7 +93,7 @@ public: protected: // Do nothing - void handleEvent(const Event& ev __attribute__((unused))) override {}; + void handleEvent(const Event& ev __attribute__((unused))) override{}; private: EventBroker& broker; diff --git a/src/shared/sensors/ADS1118/ADS1118.h b/src/shared/sensors/ADS1118/ADS1118.h index 2beedb0ac..828cdc9bb 100644 --- a/src/shared/sensors/ADS1118/ADS1118.h +++ b/src/shared/sensors/ADS1118/ADS1118.h @@ -81,7 +81,7 @@ public: MUX_AIN1_GND = 0x5, ///< AINp is AIN1 and AINn is GND MUX_AIN2_GND = 0x6, ///< AINp is AIN2 and AINn is GND MUX_AIN3_GND = 0x7 ///< AINp is AIN3 and AINn is GND - }; ///< Multiplexer values + }; ///< Multiplexer values enum ADS1118Pga { @@ -91,13 +91,13 @@ public: FSR_1_024 = 0x3, ///< FSR is ±1.024 V FSR_0_512 = 0x4, ///< FSR is ±0.512 V FSR_0_256 = 0x5 ///< FSR is ±0.256 V - }; ///< Programmable gain amplifier values + }; ///< Programmable gain amplifier values enum ADS1118Mode { CONTINUOUS_CONV_MODE = 0x0, ///< Continuous-conversion mode SINGLE_SHOT_MODE = 0x1 ///< Power-down and single-shot mode (default) - }; ///< Conversion mode values + }; ///< Conversion mode values enum ADS1118DataRate { @@ -109,19 +109,19 @@ public: DR_250 = 0x5, ///< 250 SPS DR_475 = 0x6, ///< 475 SPS DR_860 = 0x7 ///< 860 SPS - }; ///< Data rate configuration values + }; ///< Data rate configuration values enum ADS1118TempMode { ADC_MODE = 0x0, ///< ADC mode (default) TEMP_SENSOR_MODE = 0x1 ///< Temperature sensor mode - }; ///< Temperature or ADC mode values + }; ///< Temperature or ADC mode values enum ADS1118PullUp { PULL_UP_DIS = 0x0, ///< Pullup resistor disabled on DOUT pin PULL_UP_EN = 0x1 ///< Pullup resistor enabled on DOUT pin (default) - }; ///< Pull up enable or disable values + }; ///< Pull up enable or disable values union ADS1118Config { @@ -145,13 +145,13 @@ public: } byte; ///< Includes the msb and lsb bytes uint16_t word; ///< Representation in word (16-bits) format - }; ///< Structure of configuration word + }; ///< Structure of configuration word struct ADS1118InputConfig { ADS1118Mux mux = MUX_AIN0_AIN1; ///< Input's mux configuration ADS1118DataRate rate = DR_128; ///< Input's data rate configuration - }; ///< Driver's input config + }; ///< Driver's input config static constexpr uint8_t VALID_OPERATION = 0x1; ///< Indicates a valid configuration diff --git a/src/shared/sensors/BMP280/BMP280Data.h b/src/shared/sensors/BMP280/BMP280Data.h index e036b7feb..cfd3cecc2 100644 --- a/src/shared/sensors/BMP280/BMP280Data.h +++ b/src/shared/sensors/BMP280/BMP280Data.h @@ -33,8 +33,8 @@ struct BMP280Data : public TemperatureData, public PressureData BMP280Data(uint64_t timestamp, float temperature, float pressure, float humidity) - : TemperatureData{timestamp, temperature}, - PressureData{timestamp, pressure} + : TemperatureData{timestamp, temperature}, PressureData{timestamp, + pressure} { } diff --git a/src/shared/sensors/H3LIS331DL/H3LIS331DLData.h b/src/shared/sensors/H3LIS331DL/H3LIS331DLData.h index 5262e4abd..054ef30c4 100644 --- a/src/shared/sensors/H3LIS331DL/H3LIS331DLData.h +++ b/src/shared/sensors/H3LIS331DL/H3LIS331DLData.h @@ -30,12 +30,12 @@ namespace Boardcore struct H3LIS331DLData : public AccelerometerData { - H3LIS331DLData() : AccelerometerData(0, 0, 0, 0) {}; + H3LIS331DLData() : AccelerometerData(0, 0, 0, 0){}; H3LIS331DLData(uint64_t ts, float aX, float aY, float aZ) - : AccelerometerData(ts, aX, aY, aZ) {}; + : AccelerometerData(ts, aX, aY, aZ){}; - explicit H3LIS331DLData(AccelerometerData acc) : AccelerometerData(acc) {}; + explicit H3LIS331DLData(AccelerometerData acc) : AccelerometerData(acc){}; static std::string header() { diff --git a/src/shared/sensors/HILSensor.h b/src/shared/sensors/HILSensor.h index c81dfa27b..d69bf9149 100644 --- a/src/shared/sensors/HILSensor.h +++ b/src/shared/sensors/HILSensor.h @@ -71,8 +71,8 @@ public: * the sensor current sample. */ HILSensor(T&& sensor, bool enableHw, UpdateFn updateData) - : T{std::move(sensor)}, enableHw{enableHw}, - updateData{std::move(updateData)} + : T{std::move(sensor)}, enableHw{enableHw}, updateData{ + std::move(updateData)} { } diff --git a/src/shared/sensors/LPS22DF/LPS22DFData.h b/src/shared/sensors/LPS22DF/LPS22DFData.h index 2f8242c20..5867f4e52 100644 --- a/src/shared/sensors/LPS22DF/LPS22DFData.h +++ b/src/shared/sensors/LPS22DF/LPS22DFData.h @@ -32,8 +32,8 @@ struct LPS22DFData : public PressureData, public TemperatureData LPS22DFData() : PressureData{0, 0.0}, TemperatureData{0, 0.0} {} LPS22DFData(uint64_t timestamp, float pressure, float temperature) - : PressureData{timestamp, pressure}, - TemperatureData{timestamp, temperature} + : PressureData{timestamp, pressure}, TemperatureData{timestamp, + temperature} { } diff --git a/src/shared/sensors/LPS331AP/LPS331APData.h b/src/shared/sensors/LPS331AP/LPS331APData.h index 5eec12ed4..10bf25b21 100644 --- a/src/shared/sensors/LPS331AP/LPS331APData.h +++ b/src/shared/sensors/LPS331AP/LPS331APData.h @@ -34,8 +34,9 @@ struct LPS331APData : public PressureData, TemperatureData LPS331APData(uint64_t pressureTimestamp, float pressure, uint64_t temperatureTimestamp, float temperature) - : PressureData{pressureTimestamp, pressure}, - TemperatureData{temperatureTimestamp, temperature} + : PressureData{pressureTimestamp, pressure}, TemperatureData{ + temperatureTimestamp, + temperature} { } diff --git a/src/shared/sensors/MS5803/MS5803Data.h b/src/shared/sensors/MS5803/MS5803Data.h index 0ddbf938a..10eb959bd 100644 --- a/src/shared/sensors/MS5803/MS5803Data.h +++ b/src/shared/sensors/MS5803/MS5803Data.h @@ -47,8 +47,9 @@ struct MS5803Data : public PressureData, TemperatureData MS5803Data(uint64_t pressureTimestamp, float pressure, uint64_t temperatureTimestamp, float temperature) - : PressureData{pressureTimestamp, pressure}, - TemperatureData{temperatureTimestamp, temperature} + : PressureData{pressureTimestamp, pressure}, TemperatureData{ + temperatureTimestamp, + temperature} { } diff --git a/src/shared/sensors/Vectornav/VN100/VN100SerialData.h b/src/shared/sensors/Vectornav/VN100/VN100SerialData.h index 711212fdd..31e903bda 100644 --- a/src/shared/sensors/Vectornav/VN100/VN100SerialData.h +++ b/src/shared/sensors/Vectornav/VN100/VN100SerialData.h @@ -43,8 +43,8 @@ struct VN100SerialData : public QuaternionData, */ // cppcheck-suppress uninitDerivedMemberVar VN100SerialData() - : QuaternionData{0, 0.0, 0.0, 0.0, 0.0}, - MagnetometerData{0, 0.0, 0.0, 0.0}, + : QuaternionData{0, 0.0, 0.0, 0.0, 0.0}, MagnetometerData{0, 0.0, 0.0, + 0.0}, AccelerometerData{0, 0.0, 0.0, 0.0}, GyroscopeData{0, 0.0, 0.0, 0.0}, TemperatureData{0, 0.0}, PressureData{0, 0.0} { diff --git a/src/shared/sensors/Vectornav/VN100/VN100SpiData.h b/src/shared/sensors/Vectornav/VN100/VN100SpiData.h index 156e0ff0e..40376473b 100644 --- a/src/shared/sensors/Vectornav/VN100/VN100SpiData.h +++ b/src/shared/sensors/Vectornav/VN100/VN100SpiData.h @@ -42,8 +42,8 @@ struct VN100SpiData : public QuaternionData, { VN100SpiData() - : QuaternionData{0, 0.0, 0.0, 0.0, 0.0}, - MagnetometerData{0, 0.0, 0.0, 0.0}, + : QuaternionData{0, 0.0, 0.0, 0.0, 0.0}, MagnetometerData{0, 0.0, 0.0, + 0.0}, AccelerometerData{0, 0.0, 0.0, 0.0}, GyroscopeData{0, 0.0, 0.0, 0.0} { } diff --git a/src/shared/sensors/Vectornav/VN300/VN300Data.h b/src/shared/sensors/Vectornav/VN300/VN300Data.h index 46143511e..5953da14c 100644 --- a/src/shared/sensors/Vectornav/VN300/VN300Data.h +++ b/src/shared/sensors/Vectornav/VN300/VN300Data.h @@ -52,8 +52,8 @@ struct VN300Data : public QuaternionData, // cppcheck-suppress uninitDerivedMemberVar VN300Data() - : QuaternionData{0, 0.0, 0.0, 0.0, 0.0}, - MagnetometerData{0, 0.0, 0.0, 0.0}, + : QuaternionData{0, 0.0, 0.0, 0.0, 0.0}, MagnetometerData{0, 0.0, 0.0, + 0.0}, AccelerometerData{0, 0.0, 0.0, 0.0}, GyroscopeData{0, 0.0, 0.0, 0.0}, INSData{0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0} { diff --git a/src/shared/sensors/analog/TrafagPressureSensor.h b/src/shared/sensors/analog/TrafagPressureSensor.h index ba46af98b..a0539c62f 100644 --- a/src/shared/sensors/analog/TrafagPressureSensor.h +++ b/src/shared/sensors/analog/TrafagPressureSensor.h @@ -49,8 +49,8 @@ public: float shuntResistance, float maxPressure, float minCurrent = 4, float maxCurrent = 20) : getVoltage{getVoltage}, shuntResistance{shuntResistance}, - maxPressure{maxPressure}, minCurrent{minCurrent}, - maxCurrent{maxCurrent} + maxPressure{maxPressure}, minCurrent{minCurrent}, maxCurrent{ + maxCurrent} { } diff --git a/src/shared/sensors/analog/TwoPointAnalogLoadCell.h b/src/shared/sensors/analog/TwoPointAnalogLoadCell.h index 5dcde63f8..fa620b6d1 100644 --- a/src/shared/sensors/analog/TwoPointAnalogLoadCell.h +++ b/src/shared/sensors/analog/TwoPointAnalogLoadCell.h @@ -47,8 +47,8 @@ public: */ TwoPointAnalogLoadCell(std::function<ADCData()> getVoltage, float p0Voltage, float p0Mass, float p1Voltage, float p1Mass) - : getVoltage{getVoltage}, - staticScale{(p1Mass - p0Mass) / (p1Voltage - p0Voltage)}, + : getVoltage{getVoltage}, staticScale{(p1Mass - p0Mass) / + (p1Voltage - p0Voltage)}, staticOffset{p0Mass - staticScale * p0Voltage} { } diff --git a/src/shared/utils/CSVReader/CSVReader.h b/src/shared/utils/CSVReader/CSVReader.h index 09a347221..0db89a16b 100644 --- a/src/shared/utils/CSVReader/CSVReader.h +++ b/src/shared/utils/CSVReader/CSVReader.h @@ -158,7 +158,8 @@ public: { std::vector<Data> fileData; - std::for_each(begin(), end(), [&fileData](const Data& data) + std::for_each(begin(), end(), + [&fileData](const Data& data) { fileData.push_back(data); }); return fileData; diff --git a/src/tests/catch/propagator/test-propagator-data.h b/src/tests/catch/propagator/test-propagator-data.h index c54e4376a..0ce932d05 100644 --- a/src/tests/catch/propagator/test-propagator-data.h +++ b/src/tests/catch/propagator/test-propagator-data.h @@ -89,106 +89,106 @@ namespace TestPropagator1 std::chrono::milliseconds dt = 20ms; int n = 100; Boardcore::NASState nas[] = { - {1, {0, 42, 0, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {2, {-0.02, 42, 0.02, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {3, {-0.04, 42, 0.04, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {4, {-0.06, 42, 0.06, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {5, {-0.08, 42, 0.08, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {6, {-0.1, 42, 0.1, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {7, {-0.12, 42, 0.12, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {8, {-0.14, 42, 0.14, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {9, {-0.16, 42, 0.16, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {10, {-0.18, 42, 0.18, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {11, {-0.2, 42, 0.2, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {12, {-0.22, 42, 0.22, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {13, {-0.24, 42, 0.24, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {14, {-0.26, 42, 0.26, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {15, {-0.28, 42, 0.28, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {16, {-0.3, 42, 0.3, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {17, {-0.32, 42, 0.32, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {18, {-0.34, 42, 0.34, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {19, {-0.36, 42, 0.36, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {20, {-0.38, 42, 0.38, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {21, {-0.4, 42, 0.4, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {22, {-0.42, 42, 0.42, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {23, {-0.44, 42, 0.44, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {24, {-0.46, 42, 0.46, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {25, {-0.48, 42, 0.48, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {26, {-0.5, 42, 0.5, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {27, {-0.52, 42, 0.52, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {28, {-0.54, 42, 0.54, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {29, {-0.56, 42, 0.56, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {30, {-0.58, 42, 0.58, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {31, {-0.6, 42, 0.6, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {32, {-0.62, 42, 0.62, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {33, {-0.64, 42, 0.64, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {34, {-0.66, 42, 0.66, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {35, {-0.68, 42, 0.68, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {36, {-0.7, 42, 0.7, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {37, {-0.72, 42, 0.72, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {38, {-0.74, 42, 0.74, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {39, {-0.76, 42, 0.76, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {40, {-0.78, 42, 0.78, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {41, {-0.8, 42, 0.8, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {42, {-0.82, 42, 0.82, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {43, {-0.84, 42, 0.84, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {44, {-0.86, 42, 0.86, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {45, {-0.88, 42, 0.88, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {46, {-0.9, 42, 0.9, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {47, {-0.92, 42, 0.92, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {48, {-0.94, 42, 0.94, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {49, {-0.96, 42, 0.96, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {50, {-0.98, 42, 0.98, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {51, {-1, 42, 1, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {52, {-1.02, 42, 1.02, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {53, {-1.04, 42, 1.04, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {54, {-1.06, 42, 1.06, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {55, {-1.08, 42, 1.08, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {56, {-1.1, 42, 1.1, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {57, {-1.12, 42, 1.12, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {58, {-1.14, 42, 1.14, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {59, {-1.16, 42, 1.16, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {60, {-1.18, 42, 1.18, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {61, {-1.2, 42, 1.2, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {62, {-1.22, 42, 1.22, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {63, {-1.24, 42, 1.24, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {64, {-1.26, 42, 1.26, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {65, {-1.28, 42, 1.28, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {66, {-1.3, 42, 1.3, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {67, {-1.32, 42, 1.32, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {68, {-1.34, 42, 1.34, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {69, {-1.36, 42, 1.36, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {70, {-1.38, 42, 1.38, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {71, {-1.4, 42, 1.4, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {72, {-1.42, 42, 1.42, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {73, {-1.44, 42, 1.44, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {74, {-1.46, 42, 1.46, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {75, {-1.48, 42, 1.48, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {76, {-1.5, 42, 1.5, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {77, {-1.52, 42, 1.52, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {78, {-1.54, 42, 1.54, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {79, {-1.56, 42, 1.56, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {80, {-1.58, 42, 1.58, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {81, {-1.6, 42, 1.6, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {82, {-1.62, 42, 1.62, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {83, {-1.64, 42, 1.64, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {84, {-1.66, 42, 1.66, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {85, {-1.68, 42, 1.68, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {86, {-1.7, 42, 1.7, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {87, {-1.72, 42, 1.72, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {88, {-1.74, 42, 1.74, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {89, {-1.76, 42, 1.76, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {90, {-1.78, 42, 1.78, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {91, {-1.8, 42, 1.8, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {92, {-1.82, 42, 1.82, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {93, {-1.84, 42, 1.84, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {94, {-1.86, 42, 1.86, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {95, {-1.88, 42, 1.88, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {96, {-1.9, 42, 1.9, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {97, {-1.92, 42, 1.92, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {98, {-1.94, 42, 1.94, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {99, {-1.96, 42, 1.96, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, - {100, {-1.98, 42, 1.98, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}}; + {1, {0, 42, 0, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {2, {-0.02, 42, 0.02, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {3, {-0.04, 42, 0.04, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {4, {-0.06, 42, 0.06, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {5, {-0.08, 42, 0.08, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {6, {-0.1, 42, 0.1, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {7, {-0.12, 42, 0.12, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {8, {-0.14, 42, 0.14, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {9, {-0.16, 42, 0.16, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {10, {-0.18, 42, 0.18, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {11, {-0.2, 42, 0.2, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {12, {-0.22, 42, 0.22, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {13, {-0.24, 42, 0.24, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {14, {-0.26, 42, 0.26, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {15, {-0.28, 42, 0.28, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {16, {-0.3, 42, 0.3, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {17, {-0.32, 42, 0.32, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {18, {-0.34, 42, 0.34, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {19, {-0.36, 42, 0.36, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {20, {-0.38, 42, 0.38, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {21, {-0.4, 42, 0.4, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {22, {-0.42, 42, 0.42, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {23, {-0.44, 42, 0.44, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {24, {-0.46, 42, 0.46, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {25, {-0.48, 42, 0.48, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {26, {-0.5, 42, 0.5, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {27, {-0.52, 42, 0.52, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {28, {-0.54, 42, 0.54, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {29, {-0.56, 42, 0.56, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {30, {-0.58, 42, 0.58, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {31, {-0.6, 42, 0.6, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {32, {-0.62, 42, 0.62, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {33, {-0.64, 42, 0.64, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {34, {-0.66, 42, 0.66, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {35, {-0.68, 42, 0.68, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {36, {-0.7, 42, 0.7, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {37, {-0.72, 42, 0.72, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {38, {-0.74, 42, 0.74, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {39, {-0.76, 42, 0.76, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {40, {-0.78, 42, 0.78, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {41, {-0.8, 42, 0.8, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {42, {-0.82, 42, 0.82, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {43, {-0.84, 42, 0.84, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {44, {-0.86, 42, 0.86, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {45, {-0.88, 42, 0.88, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {46, {-0.9, 42, 0.9, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {47, {-0.92, 42, 0.92, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {48, {-0.94, 42, 0.94, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {49, {-0.96, 42, 0.96, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {50, {-0.98, 42, 0.98, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {51, {-1, 42, 1, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {52, {-1.02, 42, 1.02, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {53, {-1.04, 42, 1.04, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {54, {-1.06, 42, 1.06, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {55, {-1.08, 42, 1.08, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {56, {-1.1, 42, 1.1, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {57, {-1.12, 42, 1.12, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {58, {-1.14, 42, 1.14, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {59, {-1.16, 42, 1.16, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {60, {-1.18, 42, 1.18, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {61, {-1.2, 42, 1.2, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {62, {-1.22, 42, 1.22, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {63, {-1.24, 42, 1.24, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {64, {-1.26, 42, 1.26, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {65, {-1.28, 42, 1.28, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {66, {-1.3, 42, 1.3, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {67, {-1.32, 42, 1.32, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {68, {-1.34, 42, 1.34, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {69, {-1.36, 42, 1.36, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {70, {-1.38, 42, 1.38, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {71, {-1.4, 42, 1.4, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {72, {-1.42, 42, 1.42, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {73, {-1.44, 42, 1.44, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {74, {-1.46, 42, 1.46, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {75, {-1.48, 42, 1.48, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {76, {-1.5, 42, 1.5, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {77, {-1.52, 42, 1.52, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {78, {-1.54, 42, 1.54, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {79, {-1.56, 42, 1.56, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {80, {-1.58, 42, 1.58, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {81, {-1.6, 42, 1.6, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {82, {-1.62, 42, 1.62, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {83, {-1.64, 42, 1.64, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {84, {-1.66, 42, 1.66, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {85, {-1.68, 42, 1.68, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {86, {-1.7, 42, 1.7, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {87, {-1.72, 42, 1.72, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {88, {-1.74, 42, 1.74, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {89, {-1.76, 42, 1.76, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {90, {-1.78, 42, 1.78, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {91, {-1.8, 42, 1.8, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {92, {-1.82, 42, 1.82, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {93, {-1.84, 42, 1.84, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {94, {-1.86, 42, 1.86, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {95, {-1.88, 42, 1.88, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {96, {-1.9, 42, 1.9, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {97, {-1.92, 42, 1.92, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {98, {-1.94, 42, 1.94, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {99, {-1.96, 42, 1.96, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}, + {100, {-1.98, 42, 1.98, -1, 0, 1, 0, 0, 0, 1, 0, 0, 0}}}; Boardcore::PropagatorState STATE0(0, 0, nas[0]); @@ -199,224 +199,224 @@ namespace TestPropagator2 std::chrono::milliseconds dt = 20ms; int n = 100; Boardcore::NASState nas[] = { - {1, {12, -24, -48, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {2, {11.994, -23.976, -47.932, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {3, {11.988, -23.952, -47.864, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {4, {11.982, -23.928, -47.796, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {5, {11.976, -23.904, -47.728, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {6, {11.97, -23.88, -47.66, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {7, {11.964, -23.856, -47.592, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {8, {11.958, -23.832, -47.524, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {9, {11.952, -23.808, -47.456, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {10, {11.946, -23.784, -47.388, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {11, {11.94, -23.76, -47.32, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {12, {11.934, -23.736, -47.252, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {13, {11.928, -23.712, -47.184, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {14, {11.922, -23.688, -47.116, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {15, {11.916, -23.664, -47.048, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {16, {11.91, -23.64, -46.98, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {17, {11.904, -23.616, -46.912, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {18, {11.898, -23.592, -46.844, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {19, {11.892, -23.568, -46.776, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {20, {11.886, -23.544, -46.708, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {21, {11.88, -23.52, -46.64, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {22, {11.874, -23.496, -46.572, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {23, {11.868, -23.472, -46.504, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {24, {11.862, -23.448, -46.436, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {25, + {1, {12, -24, -48, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {2, {11.994, -23.976, -47.932, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {3, {11.988, -23.952, -47.864, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {4, {11.982, -23.928, -47.796, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {5, {11.976, -23.904, -47.728, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {6, {11.97, -23.88, -47.66, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {7, {11.964, -23.856, -47.592, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {8, {11.958, -23.832, -47.524, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {9, {11.952, -23.808, -47.456, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {10, {11.946, -23.784, -47.388, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {11, {11.94, -23.76, -47.32, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {12, {11.934, -23.736, -47.252, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {13, {11.928, -23.712, -47.184, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {14, {11.922, -23.688, -47.116, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {15, {11.916, -23.664, -47.048, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {16, {11.91, -23.64, -46.98, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {17, {11.904, -23.616, -46.912, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {18, {11.898, -23.592, -46.844, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {19, {11.892, -23.568, -46.776, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {20, {11.886, -23.544, -46.708, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {21, {11.88, -23.52, -46.64, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {22, {11.874, -23.496, -46.572, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {23, {11.868, -23.472, -46.504, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {24, {11.862, -23.448, -46.436, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {25, {11.856, -23.424, -46.3680000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {26, + {26, {11.85, -23.4, -46.3000000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {27, + {27, {11.844, -23.376, -46.2320000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {28, + {28, {11.838, -23.352, -46.1640000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {29, + {29, {11.832, -23.328, -46.0960000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {30, + {30, {11.826, -23.304, -46.0280000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {31, + {31, {11.82, -23.28, -45.9600000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {32, + {32, {11.814, -23.256, -45.8920000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {33, + {33, {11.808, -23.232, -45.8240000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {34, + {34, {11.802, -23.208, -45.7560000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {35, + {35, {11.796, -23.184, -45.6880000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {36, + {36, {11.79, -23.16, -45.6200000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {37, + {37, {11.784, -23.136, -45.5520000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {38, + {38, {11.778, -23.112, -45.4840000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {39, + {39, {11.772, -23.088, -45.4160000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {40, + {40, {11.766, -23.064, -45.3480000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {41, + {41, {11.76, -23.04, -45.2800000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {42, + {42, {11.754, -23.016, -45.2120000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {43, + {43, {11.748, -22.992, -45.1440000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {44, + {44, {11.742, -22.968, -45.0760000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {45, + {45, {11.736, -22.944, -45.0080000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {46, + {46, {11.73, -22.92, -44.9400000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {47, + {47, {11.724, -22.896, -44.8720000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {48, + {48, {11.718, -22.872, -44.8040000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {49, + {49, {11.712, -22.848, -44.7360000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {50, + {50, {11.706, -22.824, -44.6680000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {51, {11.7, -22.8, -44.6000000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {52, + {51, {11.7, -22.8, -44.6000000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, + {52, {11.694, -22.776, -44.5320000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {53, + {53, {11.688, -22.752, -44.4640000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {54, + {54, {11.682, -22.728, -44.3960000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {55, + {55, {11.676, -22.704, -44.3280000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {56, + {56, {11.67, -22.6799999999999, -44.2600000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {57, + {57, {11.664, -22.6559999999999, -44.1920000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {58, + {58, {11.658, -22.6319999999999, -44.1240000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {59, + {59, {11.652, -22.6079999999999, -44.0560000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {60, + {60, {11.646, -22.5839999999999, -43.9880000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {61, + {61, {11.64, -22.5599999999999, -43.9200000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {62, + {62, {11.634, -22.5359999999999, -43.8520000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {63, + {63, {11.628, -22.5119999999999, -43.7840000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {64, + {64, {11.622, -22.4879999999999, -43.7160000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {65, + {65, {11.616, -22.4639999999999, -43.6480000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {66, + {66, {11.61, -22.4399999999999, -43.5800000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {67, + {67, {11.604, -22.4159999999999, -43.5120000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {68, + {68, {11.598, -22.3919999999999, -43.4440000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {69, + {69, {11.592, -22.3679999999999, -43.3760000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {70, + {70, {11.586, -22.3439999999999, -43.3080000000001, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {71, + {71, {11.58, -22.3199999999999, -43.2400000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {72, + {72, {11.574, -22.2959999999999, -43.1720000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {73, + {73, {11.568, -22.2719999999999, -43.1040000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {74, + {74, {11.562, -22.2479999999999, -43.0360000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {75, + {75, {11.556, -22.2239999999999, -42.9680000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {76, + {76, {11.55, -22.1999999999999, -42.9000000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {77, + {77, {11.544, -22.1759999999999, -42.8320000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {78, + {78, {11.538, -22.1519999999999, -42.7640000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {79, + {79, {11.532, -22.1279999999999, -42.6960000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {80, + {80, {11.526, -22.1039999999999, -42.6280000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {81, + {81, {11.52, -22.0799999999999, -42.5600000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {82, + {82, {11.514, -22.0559999999999, -42.4920000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {83, + {83, {11.508, -22.0319999999999, -42.4240000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {84, + {84, {11.502, -22.0079999999999, -42.3560000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {85, + {85, {11.496, -21.9839999999999, -42.2880000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {86, + {86, {11.49, -21.9599999999999, -42.2200000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {87, + {87, {11.484, -21.9359999999999, -42.1520000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {88, + {88, {11.478, -21.9119999999999, -42.0840000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {89, + {89, {11.472, -21.8879999999999, -42.0160000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {90, + {90, {11.466, -21.8639999999999, -41.9480000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {91, + {91, {11.46, -21.8399999999999, -41.8800000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {92, + {92, {11.454, -21.8159999999999, -41.8120000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {93, + {93, {11.448, -21.7919999999999, -41.7440000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {94, + {94, {11.442, -21.7679999999999, -41.6760000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {95, + {95, {11.436, -21.7439999999999, -41.6080000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {96, + {96, {11.43, -21.7199999999999, -41.5400000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {97, + {97, {11.424, -21.6959999999999, -41.4720000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {98, + {98, {11.418, -21.6719999999999, -41.4040000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {99, + {99, {11.412, -21.6479999999999, -41.3360000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}, - {100, + {100, {11.406, -21.6239999999999, -41.2680000000002, -0.3, 1.2, 3.4, 0, 0, 0, 1, 0, 0, 0}}}; @@ -429,271 +429,271 @@ namespace TestPropagator3 std::chrono::milliseconds dt = 500ms; int n = 100; Boardcore::NASState nas[] = { - {1, {12, -24, -48, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {2, {11.85, -23.4, -46.3, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {3, {11.7, -22.8, -44.6, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {4, {11.55, -22.2, -42.9, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {5, {11.4, -21.6, -41.2, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {6, {11.25, -21, -39.5, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {7, {11.1, -20.4, -37.8, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {8, {10.95, -19.8, -36.1, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {9, {10.8, -19.2, -34.4, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {10, {10.65, -18.6, -32.7, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {11, {10.5, -18, -31, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {12, {10.35, -17.4, -29.3, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {13, {10.2, -16.8, -27.6, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {14, {10.05, -16.2, -25.9, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {15, {9.9, -15.6, -24.2, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {16, + {1, {12, -24, -48, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {2, {11.85, -23.4, -46.3, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {3, {11.7, -22.8, -44.6, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {4, {11.55, -22.2, -42.9, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {5, {11.4, -21.6, -41.2, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {6, {11.25, -21, -39.5, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {7, {11.1, -20.4, -37.8, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {8, {10.95, -19.8, -36.1, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {9, {10.8, -19.2, -34.4, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {10, {10.65, -18.6, -32.7, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {11, {10.5, -18, -31, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {12, {10.35, -17.4, -29.3, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {13, {10.2, -16.8, -27.6, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {14, {10.05, -16.2, -25.9, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {15, {9.9, -15.6, -24.2, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, + {16, {9.74999999999999, -15, -22.5, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {17, + {17, {9.59999999999999, -14.4, -20.8, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {18, + {18, {9.44999999999999, -13.8, -19.1, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {19, + {19, {9.29999999999999, -13.2, -17.4, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {20, + {20, {9.14999999999999, -12.6, -15.7, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {21, + {21, {8.99999999999999, -12, -14, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {22, + {22, {8.84999999999999, -11.4, -12.3, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {23, + {23, {8.69999999999999, -10.8, -10.6, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {24, + {24, {8.54999999999999, -10.2, -8.89999999999998, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {25, + {25, {8.39999999999999, -9.59999999999999, -7.19999999999998, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {26, + {26, {8.24999999999999, -8.99999999999999, -5.49999999999998, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {27, + {27, {8.09999999999999, -8.39999999999999, -3.79999999999998, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {28, + {28, {7.94999999999999, -7.79999999999999, -2.09999999999998, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {29, + {29, {7.79999999999999, -7.19999999999999, -0.399999999999984, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {30, + {30, {7.64999999999999, -6.59999999999999, 1.30000000000002, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {31, + {31, {7.49999999999999, -5.99999999999999, 3.00000000000002, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {32, + {32, {7.34999999999999, -5.39999999999999, 4.70000000000002, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {33, + {33, {7.19999999999999, -4.79999999999999, 6.40000000000002, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {34, + {34, {7.04999999999999, -4.19999999999999, 8.10000000000002, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {35, + {35, {6.89999999999999, -3.59999999999999, 9.80000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {36, + {36, {6.74999999999999, -2.99999999999999, 11.5, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {37, + {37, {6.59999999999999, -2.39999999999999, 13.2, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {38, + {38, {6.44999999999999, -1.79999999999999, 14.9, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {39, + {39, {6.29999999999999, -1.19999999999999, 16.6, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {40, + {40, {6.14999999999999, -0.599999999999988, 18.3, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {41, + {41, {5.99999999999999, 1.17683640610267e-14, 20, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {42, + {42, {5.84999999999999, 0.600000000000012, 21.7, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {43, + {43, {5.69999999999999, 1.20000000000001, 23.4, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {44, + {44, {5.54999999999998, 1.80000000000001, 25.1, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {45, + {45, {5.39999999999998, 2.40000000000001, 26.8, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {46, + {46, {5.24999999999998, 3.00000000000001, 28.5, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {47, + {47, {5.09999999999998, 3.60000000000001, 30.2, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {48, + {48, {4.94999999999998, 4.20000000000001, 31.9, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {49, + {49, {4.79999999999998, 4.80000000000001, 33.6, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {50, + {50, {4.64999999999998, 5.40000000000001, 35.3, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {51, + {51, {4.49999999999998, 6.00000000000001, 37, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {52, + {52, {4.34999999999998, 6.60000000000001, 38.7, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {53, + {53, {4.19999999999998, 7.20000000000001, 40.4, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {54, + {54, {4.04999999999998, 7.80000000000001, 42.1, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {55, + {55, {3.89999999999998, 8.40000000000001, 43.8, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {56, + {56, {3.74999999999998, 9.00000000000001, 45.5, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {57, + {57, {3.59999999999998, 9.60000000000001, 47.2, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {58, + {58, {3.44999999999998, 10.2, 48.9, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {59, + {59, {3.29999999999998, 10.8, 50.6, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {60, + {60, {3.14999999999998, 11.4, 52.3, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {61, + {61, {2.99999999999998, 12, 54, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {62, + {62, {2.84999999999998, 12.6, 55.7, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {63, + {63, {2.69999999999998, 13.2, 57.4, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {64, + {64, {2.54999999999998, 13.8, 59.1000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {65, + {65, {2.39999999999998, 14.4, 60.8000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {66, + {66, {2.24999999999998, 15, 62.5000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {67, + {67, {2.09999999999998, 15.6, 64.2000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {68, + {68, {1.94999999999998, 16.2, 65.9000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {69, + {69, {1.79999999999998, 16.8, 67.6000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {70, + {70, {1.64999999999998, 17.4, 69.3000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {71, + {71, {1.49999999999998, 18, 71.0000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {72, + {72, {1.34999999999998, 18.6, 72.7000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {73, + {73, {1.19999999999998, 19.2, 74.4000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {74, + {74, {1.04999999999998, 19.8, 76.1000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {75, + {75, {0.899999999999983, 20.4, 77.8000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {76, + {76, {0.749999999999983, 21, 79.5000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {77, + {77, {0.599999999999983, 21.6, 81.2000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {78, + {78, {0.449999999999983, 22.2, 82.9000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {79, + {79, {0.299999999999983, 22.8, 84.6000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {80, + {80, {0.149999999999983, 23.4, 86.3000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {81, + {81, {-1.71529457304587e-14, 24, 88.0000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {82, + {82, {-0.150000000000017, 24.6, 89.7000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {83, + {83, {-0.300000000000017, 25.2, 91.4000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {84, + {84, {-0.450000000000017, 25.8, 93.1000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {85, + {85, {-0.600000000000017, 26.4, 94.8000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {86, + {86, {-0.750000000000017, 27, 96.5000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {87, + {87, {-0.900000000000017, 27.6, 98.2000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {88, + {88, {-1.05000000000002, 28.2, 99.9000000000001, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {89, + {89, {-1.20000000000002, 28.8, 101.6, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {90, + {90, {-1.35000000000002, 29.4, 103.3, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {91, + {91, {-1.50000000000002, 30, 105, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {92, + {92, {-1.65000000000002, 30.6, 106.7, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {93, + {93, {-1.80000000000002, 31.2, 108.4, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {94, + {94, {-1.95000000000002, 31.8, 110.1, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {95, + {95, {-2.10000000000002, 32.4, 111.8, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {96, + {96, {-2.25000000000002, 33, 113.5, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {97, + {97, {-2.40000000000002, 33.6, 115.2, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {98, + {98, {-2.55000000000002, 34.2, 116.9, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {99, + {99, {-2.70000000000002, 34.8, 118.6, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}, - {100, + {100, {-2.85000000000002, 35.4, 120.3, -0.3, 1.2, 3.4, 0.5, 0.5, 0.5, 0.5, 1, 2, 3}}}; diff --git a/src/tests/catch/test-modulemanager.cpp b/src/tests/catch/test-modulemanager.cpp index 5b24e70dc..9b0b96f5c 100644 --- a/src/tests/catch/test-modulemanager.cpp +++ b/src/tests/catch/test-modulemanager.cpp @@ -34,7 +34,7 @@ protected: public: virtual int getDummy() { return dummy; }; - virtual void toggleDummy() {}; + virtual void toggleDummy(){}; }; class HILSensors : public SensorsModule diff --git a/src/tests/catch/test-sensormanager-catch.cpp b/src/tests/catch/test-sensormanager-catch.cpp index 78828284c..01ca815a3 100644 --- a/src/tests/catch/test-sensormanager-catch.cpp +++ b/src/tests/catch/test-sensormanager-catch.cpp @@ -96,40 +96,40 @@ private: SensorSampler* samplerSensor5; TestSensor s1; - SensorInfo s1_info{/*ID=*/"s1", - /*Period=*/1000, - /*Callback=*/[]() - { std::cout << "Callback 1!" << std::endl; }, - /*Enabled=*/true}; + SensorInfo s1_info{ + /*ID=*/"s1", + /*Period=*/1000, + /*Callback=*/[]() { std::cout << "Callback 1!" << std::endl; }, + /*Enabled=*/true}; TestSensor s2; - SensorInfo s2_info{/*ID=*/"s2", - /*Period=*/1000ms, - /*Callback=*/[]() - { std::cout << "Callback 2!" << std::endl; }, - /*Enabled=*/false}; + SensorInfo s2_info{ + /*ID=*/"s2", + /*Period=*/1000ms, + /*Callback=*/[]() { std::cout << "Callback 2!" << std::endl; }, + /*Enabled=*/false}; TestSensor s3; - SensorInfo s3_info{/*ID=*/"s3", - /*Period=*/500, - /*Callback=*/[]() - { std::cout << "Callback 3!" << std::endl; }, - /*Enabled=*/true}; + SensorInfo s3_info{ + /*ID=*/"s3", + /*Period=*/500, + /*Callback=*/[]() { std::cout << "Callback 3!" << std::endl; }, + /*Enabled=*/true}; TestSensor s4; - SensorInfo s4_info{/*ID=*/"s4", - /*Period=*/1_hz, - /*Callback=*/[]() - { std::cout << "Callback 4!" << std::endl; }, - /*Enabled=*/true}; + SensorInfo s4_info{ + /*ID=*/"s4", + /*Period=*/1_hz, + /*Callback=*/[]() { std::cout << "Callback 4!" << std::endl; }, + /*Enabled=*/true}; // always failing self-test FailingSensorCatch s5; - SensorInfo s5_info{/*ID=*/"s5", - /*Period=*/2000, - /*Callback=*/[]() - { std::cout << "Callback 5!" << std::endl; }, - /*Enabled=*/true}; + SensorInfo s5_info{ + /*ID=*/"s5", + /*Period=*/2000, + /*Callback=*/[]() { std::cout << "Callback 5!" << std::endl; }, + /*Enabled=*/true}; }; TEST_CASE_METHOD(SensorManagerFixture, -- GitLab