Page MenuHomePhorge
Files F360740

No OneTemporary
Actions

Size
5 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/apps/ccam/configuration.h b/apps/ccam/configuration.h
index 3058baa..0d1f98b 100644
--- a/apps/ccam/configuration.h
+++ b/apps/ccam/configuration.h
@@ -1,97 +1,112 @@
#ifndef CONFIGURATION_H
#define CONFIGURATION_H
// clang-tidy off
// clang-format off
-#include "nlohmann/json.hpp"
+// #include "nlohmann/json.hpp"
// clang-format on
// clang-tidy on
#include "rosa/config/version.h"
#include "rosa/app/Application.hpp"
#include <fstream>
using namespace rosa;
-using nlohmann::json;
+// using nlohmann::json;
enum DataInterfaceTypes { CSV, MQTT };
struct SignalConfiguration {
std::string Name;
std::string InputPath;
std::string MQTTTopic;
DataInterfaceTypes DataInterfaceType;
bool Output;
float InnerBound;
float OuterBound;
float InnerBoundDrift;
float OuterBoundDrift;
uint32_t SampleHistorySize;
uint32_t DABSize;
uint32_t DABHistorySize;
};
struct AppConfiguration {
std::string OutputFilePath;
uint32_t BrokenCounter;
uint32_t NumberOfSimulationCycles;
uint32_t DownsamplingRate;
std::vector<SignalConfiguration> SignalConfigurations;
};
-void from_json(const json &J, SignalConfiguration &SC) {
- J.at("Name").get_to(SC.Name);
- if (J.contains("InputPath")) {
- J.at("InputPath").get_to(SC.InputPath);
- SC.DataInterfaceType = DataInterfaceTypes::CSV;
- } else if (J.contains("MQTTTopic")) {
- J.at("MQTTTopic").get_to(SC.MQTTTopic);
- SC.DataInterfaceType = DataInterfaceTypes::MQTT;
- }
- J.at("Output").get_to(SC.Output);
- J.at("InnerBound").get_to(SC.InnerBound);
- J.at("OuterBound").get_to(SC.OuterBound);
- J.at("InnerBoundDrift").get_to(SC.InnerBoundDrift);
- J.at("OuterBoundDrift").get_to(SC.OuterBoundDrift);
- J.at("SampleHistorySize").get_to(SC.SampleHistorySize);
- J.at("DABSize").get_to(SC.DABSize);
- J.at("DABHistorySize").get_to(SC.DABHistorySize);
-}
-void from_json(const json &J, AppConfiguration &AC) {
- J.at("OutputFilePath").get_to(AC.OutputFilePath);
- J.at("BrokenCounter").get_to(AC.BrokenCounter);
- J.at("NumberOfSimulationCycles").get_to(AC.NumberOfSimulationCycles);
- J.at("DownsamplingRate").get_to(AC.DownsamplingRate);
- J.at("SignalConfigurations").get_to(AC.SignalConfigurations);
-}
+// void from_json(const json &J, SignalConfiguration &SC) {
+ // J.at("Name").get_to(SC.Name);
+ // if (J.contains("InputPath")) {
+ // J.at("InputPath").get_to(SC.InputPath);
+ // SC.DataInterfaceType = DataInterfaceTypes::CSV;
+ // } else if (J.contains("MQTTTopic")) {
+ // J.at("MQTTTopic").get_to(SC.MQTTTopic);
+ // SC.DataInterfaceType = DataInterfaceTypes::MQTT;
+ // }
+ // J.at("Output").get_to(SC.Output);
+ // J.at("InnerBound").get_to(SC.InnerBound);
+ // J.at("OuterBound").get_to(SC.OuterBound);
+ // J.at("InnerBoundDrift").get_to(SC.InnerBoundDrift);
+ // J.at("OuterBoundDrift").get_to(SC.OuterBoundDrift);
+ // J.at("SampleHistorySize").get_to(SC.SampleHistorySize);
+ // J.at("DABSize").get_to(SC.DABSize);
+ // J.at("DABHistorySize").get_to(SC.DABHistorySize);
+// }
+//
+// void from_json(const json &J, AppConfiguration &AC) {
+ // J.at("OutputFilePath").get_to(AC.OutputFilePath);
+ // J.at("BrokenCounter").get_to(AC.BrokenCounter);
+ // J.at("NumberOfSimulationCycles").get_to(AC.NumberOfSimulationCycles);
+ // J.at("DownsamplingRate").get_to(AC.DownsamplingRate);
+ // J.at("SignalConfigurations").get_to(AC.SignalConfigurations);
+// }
AppConfiguration AppConfig;
bool readConfigFile(std::string ConfigPath) {
-
- LOG_INFO("READING CONFIG FILE");
- LOG_INFO_STREAM << "Looking for config file at \"" << ConfigPath << "\"\n";
-
- std::ifstream ConfigFile;
- ConfigFile.open(ConfigPath);
-
- if (!ConfigFile) {
- LOG_ERROR("Unable to open config file");
- return false;
- }
-
- json ConfigObj;
- ConfigFile >> ConfigObj;
- LOG_INFO_STREAM << "Read JSON file as \"" << ConfigObj << "\"\n";
-
- try {
- ConfigObj.get_to(AppConfig);
- } catch (nlohmann::detail::type_error ex) {
- LOG_ERROR("Misformatted Config File");
- return false;
- }
+ (void)ConfigPath;
+
+ AppConfig.OutputFilePath = "out.csv";
+ AppConfig.BrokenCounter = 20;
+ AppConfig.NumberOfSimulationCycles = 20000;
+ AppConfig.DownsamplingRate = 1; // Instead of 50
+ AppConfig.SignalConfigurations = {{
+ "Voltage", "Voltage.csv", false, 0.01, 0.14, 0.10, 0.30, 10, 10, 5},
+ {"Temp1", "Temp1.csv", true, 0.01, 0.14, 0.10, 0.30, 10, 10, 5},
+ {"Temp2", "Temp2.csv", true, 0.01, 0.14, 0.10, 0.30, 10, 10, 5},
+ {"SharkyS", "SharkyS.csv", true, 0.01, 0.14, 0.10, 0.30, 10, 10, 5},
+ {"SharkyB", "SharkyB.csv", true, 0.01, 0.14, 0.10, 0.30, 10, 10, 5},
+ {"Dyna", "Dyna.csv", true, 0.01, 0.14, 0.10, 0.30, 10, 10, 5},
+ {"Riels", "Riels.csv", true, 0.01, 0.14, 0.10, 0.30, 10, 10, 5}};
+
+ // LOG_INFO("READING CONFIG FILE");
+ // LOG_INFO_STREAM << "Looking for config file at \"" << ConfigPath << "\"\n";
+//
+ // std::ifstream ConfigFile;
+ // ConfigFile.open(ConfigPath);
+//
+ // if (!ConfigFile) {
+ // LOG_ERROR("Unable to open config file");
+ // return false;
+ // }
+//
+ // json ConfigObj;
+ // ConfigFile >> ConfigObj;
+ // LOG_INFO_STREAM << "Read JSON file as \"" << ConfigObj << "\"\n";
+//
+ // try {
+ // ConfigObj.get_to(AppConfig);
+ // } catch (nlohmann::detail::type_error ex) {
+ // LOG_ERROR("Misformatted Config File");
+ // return false;
+ // }
return true;
}
#endif // CONFIGURATION_H

File Metadata

Mime Type
text/x-diff
Expires
Fri, May 16, 9:46 PM (19 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
141486
Default Alt Text
(5 KB)

Event Timeline