Fix Clang-Tidy issues

Author: Zaina Shaikh

Simulator/Recorders/Hdf5Recorder.cpp

@@ -189,8 +189,12 @@ void Hdf5Recorder::compileHistories()
                } else if (variableInfo.hdf5Datatype_ == PredType::NATIVE_INT) {
                   vector<int> dataBuffer(variableInfo.variableLocation_.getNumElements());
                   for (size_t i = 0; i < variableInfo.variableLocation_.getNumElements(); ++i) {
-                     if constexpr (std::is_same_v<vertexType, std::decay_t<decltype(get<vertexType>(variableInfo.variableLocation_.getElement(i)))>>) {
-                        dataBuffer[i] = static_cast<int>(get<vertexType>(variableInfo.variableLocation_.getElement(i)));
+                     if constexpr (std::is_same_v<
+                                      vertexType,
+                                      std::decay_t<decltype(get<vertexType>(
+                                         variableInfo.variableLocation_.getElement(i)))>>) {
+                        dataBuffer[i] = static_cast<int>(
+                           get<vertexType>(variableInfo.variableLocation_.getElement(i)));
                      } else {
                         dataBuffer[i] = get<int>(variableInfo.variableLocation_.getElement(i));
                      }

Simulator/Recorders/Hdf5Recorder.h

@@ -4,7 +4,6 @@
    #include "H5Cpp.h"
    #include "Model.h"
    #include "Recorder.h"
-
    #include <fstream>
    #include <vector>
 
@@ -117,8 +116,7 @@ class Hdf5Recorder : public Recorder {
             hdf5Datatype_ = PredType::NATIVE_DOUBLE;
          } else if (dataType_ == typeid(vertexType).name()) {
             hdf5Datatype_ = PredType::NATIVE_INT;
-         }
-         else {
+         } else {
             throw runtime_error("Unsupported data type");
          }
       }
@@ -140,8 +138,9 @@ class Hdf5Recorder : public Recorder {
             } else if (hdf5Datatype_ == PredType::NATIVE_INT) {
                vector<int> dataBuffer(variableLocation_.getNumElements());
                for (int i = 0; i < variableLocation_.getNumElements(); ++i) {
-                  if constexpr (std::is_same_v<vertexType, std::decay_t<decltype(get<vertexType>(variableLocation_.getElement(i)))>>) {
-                     dataBuffer[i] = static_cast<int>(get<vertexType>(variableLocation_.getElement(i)));;
+                  if constexpr (std::is_same_v<vertexType, std::decay_t<decltype(get<vertexType>
+                     (variableLocation_.getElement(i)))>>) {
+                     dataBuffer[i] = static_cast<int>(get<vertexType>(variableLocation_.getElement(i)));
                   } else {
                      dataBuffer[i] = get<int>(variableLocation_.getElement(i));
                   }

Simulator/Utils/Global.h

@@ -8,7 +8,7 @@
 // Globally available functions and default parameter values.
 
 #pragma once
-#include "MTRand.h"  
+#include "MTRand.h"
 
 // Debug output is included in both debug/release builds now.
 // The Default for debug is "LOW" and "OFF" for Release.

Simulator/Utils/VertexType.h

@@ -39,7 +39,7 @@ enum class vertexType {
 inline std::ostream &operator<<(std::ostream &os, vertexType vT)
 {
    os << static_cast<int>(vT);
-   return os; 
+   return os;
 }
 
-#endif  // VERTEX_TYPE_H
+#endif // VERTEX_TYPE_H

Testing/UnitTesting/Hdf5RecorderTests.cpp

@@ -106,15 +106,15 @@ TEST(Hdf5RecorderTest, RegisterVertexTypeTest)
    // Create a vector of NeuronType enums
    RecordableVector<vertexType> neuronTypes;
    neuronTypes.resize(2);
-   neuronTypes[0] = vertexType::EXC;  
-   neuronTypes[1] = vertexType::INH;  
+   neuronTypes[0] = vertexType::EXC;
+   neuronTypes[1] = vertexType::INH;
 
    // register the vector of NeuronTypes
    recorder.registerVariable("neuron_types", neuronTypes, Recorder::UpdatedType::DYNAMIC);
 
    // Verify that the registered variables are stored correctly
    const auto &variableTable = recorder.getVariableTable();
-   ASSERT_EQ(1, variableTable.size());  // Only one variable, "neuron_types"
+   ASSERT_EQ(1, variableTable.size());   // Only one variable, "neuron_types"
 
    // Verify that the registered variable name matches
    ASSERT_EQ("neuron_types", variableTable[0].variableName_);
@@ -182,9 +182,9 @@ TEST(Hdf5RecorderTest, SaveSimDataVertexTypeTest)
    // Create and configure RecordableVector<vertexType> for testing
    RecordableVector<vertexType> neuronTypes;
    neuronTypes.resize(3);
-   neuronTypes[0] = vertexType::EXC;  
-   neuronTypes[1] = vertexType::INH; 
-   neuronTypes[2] = vertexType::EXC;  
+   neuronTypes[0] = vertexType::EXC;
+   neuronTypes[1] = vertexType::INH;
+   neuronTypes[2] = vertexType::EXC;
 
    // Register the variable with Hdf5Recorder
    recorder.registerVariable("neuron_types", neuronTypes, Recorder::UpdatedType::CONSTANT);
@@ -205,10 +205,9 @@ TEST(Hdf5RecorderTest, SaveSimDataVertexTypeTest)
    dataset.read(dataBuffer.data(), PredType::NATIVE_INT);
 
    // Verify the data matches the expected NeuronType values (converted to int)
-   vector<int> expectedData = {static_cast<int>(vertexType::EXC), 
-                               static_cast<int>(vertexType::INH), 
+   vector<int> expectedData = {static_cast<int>(vertexType::EXC), static_cast<int>(vertexType::INH),
                                static_cast<int>(vertexType::EXC)};
-   
+                               
    ASSERT_EQ(expectedData.size(), dataBuffer.size());
    for (size_t i = 0; i < expectedData.size(); ++i) {
       EXPECT_EQ(expectedData[i], dataBuffer[i]);
@@ -288,7 +287,7 @@ TEST(Hdf5RecorderTest, CompileHistoriesVertexTypeTest)
 
    // Call compileHistories() multiple times to simulate multiple epochs
    for (int epoch = 0; epoch < 3; ++epoch) {
-      // Clear and insert new NeuronType values 
+      // Clear and insert new NeuronType values
       eventBufferNeuron.clear();
       eventBufferNeuron.insertEvent(static_cast<int>(vertexType::EXC));
       eventBufferNeuron.insertEvent(static_cast<int>(vertexType::INH));

Testing/UnitTesting/XmlRecorderTests.cpp

@@ -105,7 +105,7 @@ TEST(XmlRecorderTest, RegisterVectorVertexTypeTest)
    // Create an instance of XmlRecorder
    XmlRecorder recorder;
 
-   // Create a RecordableVector<vertexType> 
+   // Create a RecordableVector<vertexType>
    RecordableVector<vertexType> vertTypes;
    vertTypes.resize(2);
    vertTypes[0] = vertexType::EXC;
@@ -170,7 +170,8 @@ TEST(XmlRecorderTest, CompileHistoriesTest)
 
    // Call the compileHistories method
    recorderTest_->compileHistories();
-   vector<std::variant<uint64_t, bool, int, BGFLOAT, vertexType>> history = recorderTest_->getHistory(0);
+   vector<std::variant<uint64_t, bool, int, BGFLOAT, vertexType>> history
+      = recorderTest_->getHistory(0);
 
    // Verify the events compiled hisotry
    uint64_t data = 1;
@@ -198,7 +199,9 @@ TEST(XmlRecorderTest, ToXML)
    // Verify the expected XML output
    stringstream os;
    os << "<Matrix ";
-   os << "name=\"" << "TestVar" << "\" ";
+   os << "name=\""
+      << "TestVar"
+      << "\" ";
    os << "type=\"complete\" rows=\"" << 1 << "\" columns=\"" << variableHistory.size()
       << "\" multiplier=\"1.0\">" << endl;
    os << "   ";
@@ -261,19 +264,19 @@ TEST(XmlRecorderTest, SaveSimDataVertexTypeTest)
 {
    std::string outputFile = "../Testing/UnitTesting/TestOutput/test_vertex_type.xml";
    unique_ptr<XmlRecorder> recorderTest_(new XmlRecorder(outputFile));
-   
-   // Create a recordable vector 
+
+   // Create a recordable vector
    RecordableVector<vertexType> vertTypes;
    vertTypes.resize(2);
-   vertTypes[0] = vertexType::EXC;  
-   vertTypes[1] = vertexType::INH;  
+   vertTypes[0] = vertexType::EXC;
+   vertTypes[1] = vertexType::INH;
 
    // Register the RecordableVector of VertexTypes
    recorderTest_->registerVariable("VertexTypes", vertTypes, Recorder::UpdatedType::DYNAMIC);
 
    // initialize the XmlRecorder object
    recorderTest_->init();
-   
+
    // Call the compileHistories method
    recorderTest_->compileHistories();
    // Call the saveSimData() function
@@ -284,15 +287,16 @@ TEST(XmlRecorderTest, SaveSimDataVertexTypeTest)
    std::stringstream outputBuffer;
    outputBuffer << inputFile.rdbuf();
    inputFile.close();
-   
+
    // checks for saving simulation data
    vector<std::variant<uint64_t, bool, int, BGFLOAT, vertexType>> mock_history
       = {vertexType::EXC, vertexType::INH};
 
    std::string expect_header = "<?xml version=\"1.0\" standalone=\"no\"?>\n";
    std::string expect_end = "\n";
    std::string expectXML
-      = expect_header + recorderTest_->getToXML("VertexTypes", mock_history, typeid(vertexType).name())
+      = expect_header
+        + recorderTest_->getToXML("VertexTypes", mock_history, typeid(vertexType).name())
         + expect_end;
    // Vertify the output string
    ASSERT_EQ(outputBuffer.str(), expectXML);