diff --git a/buildResult/dataAcquisition.h b/buildResult/dataAcquisition.h deleted file mode 100644 index b6b6602..0000000 --- a/buildResult/dataAcquisition.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef DATA_ACQUISITION_H -#define DATA_ACQUISITION_H - -#include -#include -#include - -typedef struct { - float mean; - float standardDeviation; - int possibleFaultySensor; -} Metrics; - -typedef struct { - int sensorsNumber; - int slidingWindowSize; -} Matrix; - -void initializeReadings(int numSensors, float deltaTime); -bool freeReadings(); - -int getSensorsNumber(); -int getSlidingWindowSize(); -bool isFull(int sensorIndex); - -void addReading(float value); - -float getAverageOnSensor(int sensorIndex); -float getAverageOnAllSensors(); -float getOverallAverage(); - -float getStandardDeviationOnSensor(int sensorIndex); -float getStandardDeviationOnAllSensors(); -float getOverallStandardDeviation(); - -float getLastReading(int sensorIndex); - -bool anomalyDetect(float average, float standardDeviation); - -int getOutlierCount(); - -Metrics getMetrics(float **readings, int sensorNumber, int slidingWindow); - -#endif // DATA_ACQUISITION_H \ No newline at end of file diff --git a/buildResult/libdataAcquisition.a b/buildResult/libdataAcquisition.a deleted file mode 100644 index b9159de..0000000 Binary files a/buildResult/libdataAcquisition.a and /dev/null differ diff --git a/include/dataAcquisition.h b/include/dataAcquisition.h index b6b6602..0c91fbe 100644 --- a/include/dataAcquisition.h +++ b/include/dataAcquisition.h @@ -35,7 +35,7 @@ float getOverallStandardDeviation(); float getLastReading(int sensorIndex); -bool anomalyDetect(float average, float standardDeviation); +void anomalyDetect(float average, float standardDeviation); int getOutlierCount(); diff --git a/libraries/dataAcquisition.c b/libraries/dataAcquisition.c index 0df8ef7..c3cb26d 100644 --- a/libraries/dataAcquisition.c +++ b/libraries/dataAcquisition.c @@ -3,6 +3,8 @@ #include #include +#include + int outlierCount; // Variable definition @@ -10,11 +12,7 @@ static float **readings; static int sensorsNumber; static int slidingWindowSize; -typedef struct { - float mean; - float standardDeviation; - int possibleFaultySensor; -} Metrics; + /**