Feature/506 set data buffer method in storage unit

src/simulation/onboardDataHandling/_GeneralModuleFiles/dataStorageUnitBase.cpp

@@ -27,8 +27,12 @@
 DataStorageUnitBase::DataStorageUnitBase(){
     this->previousTime = 0; //! - previousTime initialized to 0.
     this->nodeDataUseInMsgs.clear(); //! - Clear the vector of input messages.
-    this->storedDataSum = 0.0; //! - Initialize the dataSum to 0.
+    this->storedDataSum = 0; //! - Initialize the dataSum to 0.
     this->netBaud = 0.0; //! - Initialize the netBaudRate to 0.
+    //! - Zero out the partitions
+    for(uint64_t i = 0; i < this->storedData.size(); i++){
+        this->storedData[i].dataInstanceSum = 0;
+    }
     return;
 }
 
@@ -168,18 +172,18 @@ void DataStorageUnitBase::integrateDataStatus(double currentTime){
         index = messageInStoredData(&(*it));
 
         //! - If the storage capacity has not been reached or the baudRate is less than 0 and won't take below 0, then add the data
-       if ((this->storedDataSum < this->storageCapacity) || (it->baudRate < 0)) {
+       if ((this->storedDataSum + round(it->baudRate * this->currentTimestep) <= this->storageCapacity) || (it->baudRate < 0)) {
            //! - if a dataNode exists in storedData vector, integrate and add to current amount
            if (index != -1) {
                //! Only perform if this operation will not take the sum below zero
                if ((this->storedData[(size_t) index].dataInstanceSum + it->baudRate * (this->currentTimestep)) >= 0) {
-                   this->storedData[(size_t) index].dataInstanceSum += it->baudRate * (this->currentTimestep);
+                   this->storedData[(size_t) index].dataInstanceSum += round(it->baudRate * (this->currentTimestep));
                }
                //! - if a dataNode does not exist in storedData, add it to storedData, integrate baud rate, and add amount
            }
            else if (strcmp(it->dataName, "") != 0) {
                strncpy(tmpDataInstance.dataInstanceName, it->dataName, sizeof(tmpDataInstance.dataInstanceName));
-               tmpDataInstance.dataInstanceSum = it->baudRate * (this->currentTimestep);
+               tmpDataInstance.dataInstanceSum = round(it->baudRate * (this->currentTimestep));
                this->storedData.push_back(tmpDataInstance);
            }
        }
@@ -214,8 +218,8 @@ int DataStorageUnitBase::messageInStoredData(DataNodeUsageMsgPayload *tmpNodeMsg
 /*! Sums all of the data in the storedData vector
  @return double
  */
-double DataStorageUnitBase::sumAllData(){
-    double dataSum = 0.0;
+long long int DataStorageUnitBase::sumAllData(){
+    double dataSum = 0;
 
     std::vector<dataInstance>::iterator it;
     for(it = storedData.begin(); it != storedData.end(); it++) {
@@ -248,3 +252,45 @@ bool DataStorageUnitBase::customReadMessages()
 {
     return true;
 }
+
+/*! Adds a specific amount of data to the storedData vector once
+ @param partitionName //Name of the partition to add data to
+ @param data          //Amount of data to add to the partition
+ @return void
+ */
+void DataStorageUnitBase::setDataBuffer(std::string partitionName, long long int data)
+{
+    dataInstance tmpDataInstance;
+
+    int index = -1;
+    for (uint64_t i = 0; i < this->storedData.size(); i++){
+        if (strcmp(this->storedData[i].dataInstanceName, partitionName.c_str()) == 0){
+            index = (int) i;
+        }
+    }
+
+    //! - If the new data won't overflow the storage capacity, then add the data
+    if (this->storedDataSum + data <= this->storageCapacity) {
+        //! - if a dataNode exists in storedData vector, integrate and add to current amount
+        if (index != -1) {
+            //! Only perform if this operation will not take the sum below zero
+            if ((this->storedData[(size_t) index].dataInstanceSum + data) >= 0) {
+                this->storedData[(size_t) index].dataInstanceSum += data;
+            }
+
+        }
+        //! - if a dataNode does not exist in storedData, add it to storedData, and add amount
+        else if (strcmp(partitionName.c_str(), "") != 0) {
+            strncpy(tmpDataInstance.dataInstanceName, partitionName.c_str(), sizeof(tmpDataInstance.dataInstanceName));
+            //! Only perform this operation if the resulting sum in the partition is not negative. If it is, initialize to zero.
+            if (data < 0) {
+                data = 0;
+            }
+            tmpDataInstance.dataInstanceSum = data;
+            this->storedData.push_back(tmpDataInstance);
+        }
+    }
+
+    //! - Sum all data in storedData vector
+    this->storedDataSum = this->sumAllData();
+}

src/simulation/onboardDataHandling/_GeneralModuleFiles/dataStorageUnitBase.h

@@ -34,7 +34,7 @@
 
 struct dataInstance {
     char dataInstanceName[128];     //!< data instance name
-    double dataInstanceSum;         //!< data instance sum value, bits
+    long long int dataInstanceSum;         //!< data instance sum value, bits
 }; //!< Struct for instances of data stored in a buffer. Includes names and amounts.
 
 /*! @brief on-board data handling base class */
@@ -45,6 +45,7 @@ class DataStorageUnitBase: public SysModel {
     void Reset(uint64_t CurrentSimNanos);
     void addDataNodeToModel(Message<DataNodeUsageMsgPayload> *tmpNodeMsg); //!< Adds dataNode to the storageUnit
     void UpdateState(uint64_t CurrentSimNanos);
+    void setDataBuffer(std::string partitionName, long long int data); //!< Adds/removes the data from the partitionName partition once
 
 protected:
     void writeMessages(uint64_t CurrentClock);
@@ -54,18 +55,18 @@ class DataStorageUnitBase: public SysModel {
     virtual void customWriteMessages(uint64_t CurrentClock); //!< custom Write method, similar to customSelfInit.
     virtual bool customReadMessages(); //!< Custom read method, similar to customSelfInit; returns `true' by default.
     int messageInStoredData(DataNodeUsageMsgPayload *tmpNodeMsg); //!< Returns index of the dataName if it's already in storedData
-    double sumAllData(); //!< Sums all of the data in the storedData vector
+    long long int sumAllData(); //!< Sums all of the data in the storedData vector
 
 public:
     std::vector<ReadFunctor<DataNodeUsageMsgPayload>> nodeDataUseInMsgs; //!< Vector of data node input message names
     Message<DataStorageStatusMsgPayload> storageUnitDataOutMsg; //!< Vector of message names to be written out by the storage unit
-    double storageCapacity; //!< Storage capacity of the storage unit
+    long long int storageCapacity; //!< Storage capacity of the storage unit
     BSKLogger bskLogger;    //!< logging variable
 
 protected:
     DataStorageStatusMsgPayload storageStatusMsg; //!< class variable
     std::vector<DataNodeUsageMsgPayload> nodeBaudMsgs; //!< class variable
-    double storedDataSum; //!< [bits] Stored data in bits.
+    long long int storedDataSum; //!< [bits] Stored data in bits.
     std::vector<dataInstance> storedData; //!< Vector of data. Represents the makeup of the data buffer.
     double previousTime; //!< Previous time used for integration
     double currentTimestep;//!< [s] Timestep duration in seconds.