cmd and tidy code

pachadotdev · Nov 19, 2024 · e97fda7 · e97fda7
1 parent 48e14ed
commit e97fda7
Show file tree

Hide file tree

Showing 61 changed files with 676 additions and 674 deletions.
diff --git a/.github/workflows/tests-ubuntu-installer.yml b/.github/workflows/tests-ubuntu-installer.yml
@@ -34,3 +34,24 @@ jobs:
         run: |
           ls -l test/uru2011mini/dic-to-csv
           ls -l test/uru2011mini/dicx-to-csv
+          
+          validate_csv() {
+            local file=$1
+            local expected_lines=$2
+            local expected_columns=$3
+
+            # Get the number of lines
+            actual_lines=$(wc -l < "$file")
+            # Get the number of columns (assuming the first line contains the headers)
+            actual_columns=$(head -n 1 "$file" | awk -F';' '{print NF}')
+
+            if [[ "$actual_lines" -eq "$expected_lines" && "$actual_columns" -eq "$expected_columns" ]]; then
+              echo "Validation passed for $file"
+            else
+              echo "Validation failed for $file: expected $expected_lines lines and $expected_columns columns, but got $actual_lines lines and $actual_columns columns"
+              exit 1
+            fi
+          }
+
+          validate_csv "test/uru2011mini/dic-to-csv/SEXO.csv" 38 4
+          validate_csv "test/uru2011mini/dicx-to-csv/SEXO.csv" 38 4
diff --git a/Makefile b/Makefile
@@ -90,7 +90,4 @@ $(OBJ_DIR)/moc_%.o: $(OBJ_DIR)/moc_%.cpp
 clean:
 	rm -rf $(OBJ_DIR) $(LIB_DIR) $(TARGET_REDATAM) $(TARGET_GUI)
 
-format: $(shell find . -name '*.h') $(shell find . -name '*.hpp') $(shell find . -name '*.cpp')
-	@${clang_format} -i $?
-
-.PHONY: all clean nogui
+.PHONY: all clean nogui
diff --git a/dev/03-test-with-valgrind.sh b/dev/03-test-with-valgrind.sh
@@ -4,8 +4,27 @@ make clean
 
 make -f Makefile-debug
 
-mkdir -p test/uru2011mini
-
 valgrind --leak-check=full --track-origins=yes --log-file=test/uru2011mini/log-dic-to-csv.txt ./redatam test/uru2011mini/uru2011mini.dic test/uru2011mini/dic-to-csv
 
 valgrind --leak-check=full --track-origins=yes --log-file=test/uru2011mini/log-dicx-to-csv.txt ./redatam test/uru2011mini/uru2011mini.dicx test/uru2011mini/dicx-to-csv
+
+validate_csv() {
+  local file=$1
+  local expected_lines=$2
+  local expected_columns=$3
+
+  # Get the number of lines
+  actual_lines=$(wc -l < "$file")
+  # Get the number of columns (assuming the first line contains the headers)
+  actual_columns=$(head -n 1 "$file" | awk -F';' '{print NF}')
+
+  if [[ "$actual_lines" -eq "$expected_lines" && "$actual_columns" -eq "$expected_columns" ]]; then
+    echo "Validation passed for $file"
+  else
+    echo "Validation failed for $file: expected $expected_lines lines and $expected_columns columns, but got $actual_lines lines and $actual_columns columns"
+    exit 1
+  fi
+}
+
+validate_csv "test/uru2011mini/dic-to-csv/SEXO.csv" 38 4
+validate_csv "test/uru2011mini/dicx-to-csv/SEXO.csv" 38 4
diff --git a/dev/format-code.sh b/dev/format-code.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Find clang-format
+clang_format=$(which clang-format-19)
+
+# Check if clang-format is installed
+if [ -z "$clang_format" ]; then
+  echo "clang-format-19 is not installed. Please install it first."
+  exit 1
+fi
+
+# Find all .h, .hpp, and .cpp files, excluding those in the vendor/ directory
+files=$(find . -path ./vendor -path ./rpkg/src/vendor -path ./pypkg/redatam/vendor -prune -o -name '*.h' -o -name '*.hpp' -o -name '*.cpp' -print)
+
+# Format each file
+for file in $files; do
+  echo "Formatting $file"
+  $clang_format -i "$file"
+done
+
+echo "Formatting complete."
diff --git a/format-code.sh b/format-code.sh
diff --git a/include/database/RedatamDatabase.hpp b/include/database/RedatamDatabase.hpp
@@ -1,7 +1,7 @@
 #ifndef REDATAMLIB_REDATAMDATABASE_HPP
 #define REDATAMLIB_REDATAMDATABASE_HPP
 
-#include <stdexcept>  // invalid_argument
+#include <stdexcept> // invalid_argument
 #include <string>
 #include <vector>
 
@@ -12,7 +12,7 @@ using std::string;
 using std::vector;
 
 class RedatamDatabase {
- public:
+public:
   // Throws invalid_argument
   explicit RedatamDatabase(const string &fileName);
   ~RedatamDatabase() = default;
@@ -23,12 +23,12 @@ class RedatamDatabase {
   void ExportCSVFiles(const string &outputDir);
   void ExportSummary(const string &outputDir);
 
- private:
+private:
   vector<Entity> m_entities;
 
   void OpenDictionary(const string &fileName);
 };
 
-}  // namespace RedatamLib
+} // namespace RedatamLib
 
-#endif  // REDATAMLIB_REDATAMDATABASE_HPP
+#endif // REDATAMLIB_REDATAMDATABASE_HPP
diff --git a/include/entities/Entity.hpp b/include/entities/Entity.hpp
@@ -3,7 +3,7 @@
 
 #include <memory>
 #include <string>
-#include <utility>  // pair
+#include <utility> // pair
 #include <vector>
 
 #include "ByteArrayReader.hpp"
@@ -16,7 +16,7 @@ using std::string;
 using std::vector;
 
 class Entity {
- public:
+public:
   Entity();
   Entity(const string &name, const string &parentName,
          const string &description, const string &idxFileName,
@@ -39,7 +39,7 @@ class Entity {
   void AttachChild(Entity *child);
   void AttachVariables(shared_ptr<vector<Variable>> variables);
 
- private:
+private:
   string m_name;
   string m_parentName;
   string m_description;
@@ -50,6 +50,6 @@ class Entity {
   ByteArrayReader m_reader;
   size_t m_rowsCount;
 };
-}  // namespace RedatamLib
+} // namespace RedatamLib
 
-#endif  // REDATAMLIB_ENTITY_HPP
+#endif // REDATAMLIB_ENTITY_HPP
diff --git a/include/entities/Variable.hpp b/include/entities/Variable.hpp
@@ -1,9 +1,9 @@
 #ifndef REDATAMLIB_VARIABLE_HPP
 #define REDATAMLIB_VARIABLE_HPP
 
-#include <memory>  // shared_ptr
+#include <memory> // shared_ptr
 #include <string>
-#include <utility>  // pair
+#include <utility> // pair
 #include <vector>
 
 namespace RedatamLib {
@@ -13,12 +13,12 @@ using std::string;
 using std::vector;
 
 enum VarType { BIN, CHR, DBL, INT, LNG, PCK, NA };
-using Tag = pair<string, string>;  // Tag = <Key, Value>
+using Tag = pair<string, string>; // Tag = <Key, Value>
 
-class ByteArrayReader;  // Forward declaration
+class ByteArrayReader; // Forward declaration
 
 class Variable {
- public:
+public:
   Variable();
   Variable(const string &name, VarType type, const string &idxFileName,
            size_t dataSize, const string &filter, const string &range,
@@ -36,7 +36,7 @@ class Variable {
   size_t GetDecimals() const;
   shared_ptr<void> GetValues() const;
 
- private:
+private:
   string m_name;
   VarType m_type;
   string m_idxFileName;
@@ -57,6 +57,6 @@ class Variable {
   void ParseFloats(ByteArrayReader &reader);
 };
 
-}  // namespace RedatamLib
+} // namespace RedatamLib
 
-#endif  // REDATAMLIB_VARIABLE_HPP
+#endif // REDATAMLIB_VARIABLE_HPP
diff --git a/include/exporters/CSVExporter.hpp b/include/exporters/CSVExporter.hpp
@@ -9,12 +9,12 @@
 #include "Variable.hpp"
 
 namespace RedatamLib {
+using std::mutex;
 using std::string;
 using std::vector;
-using std::mutex;
 
 class CSVExporter {
- public:
+public:
   explicit CSVExporter(const string &outputDirectory);
   ~CSVExporter() = default;
 
@@ -23,7 +23,7 @@ class CSVExporter {
 
   void ExportAll(vector<Entity> &entities);
 
- private:
+private:
   string m_path;
   mutable mutex m_mtx;
 
@@ -32,6 +32,6 @@ class CSVExporter {
   void CreateVariablesData(Entity &e) const;
   void ThreadExport(size_t start, size_t end, vector<Entity> &entities) const;
 };
-}  // namespace RedatamLib
+} // namespace RedatamLib
 
-#endif  // REDATAMLIB_CSVEXPORTER_HPP
+#endif // REDATAMLIB_CSVEXPORTER_HPP
diff --git a/include/exporters/ParentIDCalculator.hpp b/include/exporters/ParentIDCalculator.hpp
@@ -5,7 +5,7 @@
 
 namespace RedatamLib {
 class ParentIDCalculator {
- public:
+public:
   explicit ParentIDCalculator(Entity *child);
   ~ParentIDCalculator() = default;
 
@@ -14,11 +14,11 @@ class ParentIDCalculator {
 
   size_t GetParentID(size_t currRow);
 
- private:
+private:
   Entity *m_child;
   size_t m_currID;
   size_t m_currLimit;
 };
-}  // namespace RedatamLib
+} // namespace RedatamLib
 
-#endif  // REDATAMLIB_PARENTIDCALCULATOR_HPP
+#endif // REDATAMLIB_PARENTIDCALCULATOR_HPP
diff --git a/include/exporters/XMLExporter.hpp b/include/exporters/XMLExporter.hpp
@@ -13,12 +13,12 @@ using std::string;
 using std::vector;
 
 class XMLExporter {
- public:
+public:
   explicit XMLExporter(const string &outputDirectory);
   ~XMLExporter() = default;
   void ExportSummary(vector<Entity> &entities);
 
- private:
+private:
   string m_path;
   pugi::xml_document m_doc;
 
@@ -30,6 +30,6 @@ class XMLExporter {
   static string GetVarType(VarType type);
 };
 
-}  // namespace RedatamLib
+} // namespace RedatamLib
 
-#endif  // REDATAMLIB_XMLEXPORTER_HPP
+#endif // REDATAMLIB_XMLEXPORTER_HPP
diff --git a/include/readers/BitArrayReader.hpp b/include/readers/BitArrayReader.hpp
@@ -2,15 +2,15 @@
 #define REDATAMLIB_BITARRREADER_HPP
 
 #include <bitset>
-#include <cstdint>  // uint16_t, uint32_t
+#include <cstdint> // uint16_t, uint32_t
 #include <vector>
 
 namespace RedatamLib {
 using std::bitset;
 using std::vector;
 
 class BitArrayReader {
- public:
+public:
   explicit BitArrayReader(size_t dataSize);
   ~BitArrayReader() = default;
 
@@ -19,7 +19,7 @@ class BitArrayReader {
 
   void ParseBits(vector<uint32_t> *results, uint32_t data);
 
- private:
+private:
   size_t m_varSize;
   size_t m_remainderSize;
   bitset<32> m_mask;
@@ -29,6 +29,6 @@ class BitArrayReader {
   bitset<32> CreateMask(size_t size);
 };
 
-}  // namespace RedatamLib
+} // namespace RedatamLib
 
-#endif  // REDATAMLIB_BITARRREADER_HPP
+#endif // REDATAMLIB_BITARRREADER_HPP
diff --git a/include/readers/ByteArrayReader.hpp b/include/readers/ByteArrayReader.hpp
@@ -1,9 +1,9 @@
 #ifndef REDATAMLIB_BYTEARRREADER_HPP
 #define REDATAMLIB_BYTEARRREADER_HPP
 
-#include <cstddef>    // size_t
-#include <cstdint>    // uint16_t, uint32_t
-#include <stdexcept>  // out_of_range, length_error
+#include <cstddef>   // size_t
+#include <cstdint>   // uint16_t, uint32_t
+#include <stdexcept> // out_of_range, length_error
 #include <string>
 #include <vector>
 
@@ -14,7 +14,7 @@ using std::string;
 using std::vector;
 
 class ByteArrayReader {
- public:
+public:
   ByteArrayReader();
   // throws ios_base::failure if fails to open file
   ByteArrayReader(const string &filePath);
@@ -48,7 +48,7 @@ class ByteArrayReader {
   uint16_t ReadInt16BE();
   uint32_t ReadInt32BE();
 
- private:
+private:
   vector<unsigned char> m_data;
   size_t m_currPos;
   size_t m_endPos;
@@ -58,6 +58,6 @@ class ByteArrayReader {
   bool IsValidStr(const string &str);
 };
 
-}  // namespace RedatamLib
+} // namespace RedatamLib
 
-#endif  // REDATAMLIB_BYTEARRREADER_HPP
+#endif // REDATAMLIB_BYTEARRREADER_HPP