Skip to content

Commit 6fa7918

Browse files
authored
Feature/removing demographics (#107)
* I might've officially lost my mind * updating the data types and cost effectiveness * Working on some basic data structure stuff * cleaning up respond to just have the model and the cost effectiveness * I am confused about tests * cost effectriveness testing * adding tests for respond functions * removing executable * removing and updating the building tools * addressing PR comments * adding the clang-formatting workflow * removing the branch name from the push on the formatting workflow * removing release workflow * quick update for the overdose thing to remove a needless vector and adding a size check
1 parent 4dfb07a commit 6fa7918

70 files changed

Lines changed: 1481 additions & 7666 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Clang Formatting
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
pull_request:
7+
branches: [ "main" ]
8+
9+
env:
10+
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
11+
BUILD_TYPE: Debug
12+
13+
jobs:
14+
cpp-linter:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
- uses: cpp-linter/cpp-linter-action@v2
19+
id: linter
20+
env:
21+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22+
with:
23+
style: 'file' # Use .clang-format config file.
24+
tidy-checks: '-*' # disable clang-tidy checks.
25+
26+
- name: Fail fast?!
27+
if: steps.linter.outputs.clang-format-checks-failed > 0
28+
run: exit 1

.github/workflows/release.yml

Lines changed: 0 additions & 66 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,8 @@ endif()
5858
# Building the Library
5959
# ---------------------------------------------------------------------------------------
6060
set(RESPOND_SRCS
61-
src/data_ops/cost_loader.cpp
62-
src/data_ops/data_formatter.cpp
63-
src/data_ops/data_loader.cpp
64-
src/data_ops/utility_loader.cpp
65-
src/data_ops/writer.cpp
66-
src/model/simulation.cpp
67-
src/utils/logging.cpp
61+
src/markov.cpp
62+
src/logging.cpp
6863
)
6964

7065
if(RESPOND_BUILD_SHARED_LIBS)
@@ -94,15 +89,14 @@ endif()
9489

9590
target_compile_definitions(respond PUBLIC RESPOND_COMPILED_LIB)
9691
target_include_directories(respond ${RESPOND_INCLUDES_LEVEL} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
97-
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
98-
PRIVATE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>")
92+
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" PRIVATE
93+
"$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>")
9994

10095
include(MakeDependenciesAvailable)
10196

10297
if (RESPOND_CALCULATE_COVERAGE)
10398
target_link_libraries(respond
10499
PUBLIC
105-
datamanagement::datamanagement
106100
Eigen3::Eigen
107101
PRIVATE
108102
spdlog::spdlog
@@ -111,7 +105,6 @@ if (RESPOND_CALCULATE_COVERAGE)
111105
else()
112106
target_link_libraries(respond
113107
PUBLIC
114-
datamanagement::datamanagement
115108
Eigen3::Eigen
116109
PRIVATE
117110
spdlog::spdlog

CMakePresets.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"inherits": "configuration-common-linux",
4545
"cacheVariables": {
4646
"CMAKE_BUILD_TYPE": "Debug",
47-
"RESPOND_BUILD_EXECUTABLE": "ON",
4847
"RESPOND_BUILD_TESTS": "ON",
4948
"RESPOND_CALCULATE_COVERAGE": "ON",
5049
"RESPOND_BUILD_BENCH": "OFF",
@@ -62,7 +61,6 @@
6261
"inherits": "configuration-common-linux",
6362
"cacheVariables": {
6463
"CMAKE_BUILD_TYPE": "Release",
65-
"RESPOND_BUILD_EXECUTABLE": "ON",
6664
"RESPOND_BUILD_TESTS": "OFF",
6765
"RESPOND_CALCULATE_COVERAGE": "OFF",
6866
"RESPOND_BUILD_BENCH": "OFF",
@@ -79,17 +77,11 @@
7977
},
8078
{
8179
"name": "gcc-release-cluster",
82-
"inherits": "gcc-release",
83-
"cacheVariables": {
84-
"CMAKE_PREFIX_PATH": "${fileDir}/lib/sqlitecpp"
85-
}
80+
"inherits": "gcc-release"
8681
},
8782
{
8883
"name": "gcc-debug-cluster",
89-
"inherits": "gcc-debug",
90-
"cacheVariables": {
91-
"CMAKE_PREFIX_PATH": "${fileDir}/lib/sqlitecpp"
92-
}
84+
"inherits": "gcc-debug"
9385
}
9486
],
9587
"buildPresets": [

cmake/BuildBinaries.cmake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
if(RESPOND_BUILD_EXECUTABLE OR RESPOND_BUILD_ALL)
2-
message(STATUS "Building Executable")
3-
add_subdirectory(extras/executable)
4-
endif()
5-
61
if(RESPOND_BUILD_TESTS OR RESPOND_BUILD_ALL)
72
message(STATUS "Generating tests")
83
if(RESPOND_CALCULATE_COVERAGE)

cmake/LoadDataManagement.cmake

Lines changed: 0 additions & 12 deletions
This file was deleted.

cmake/MakeDependenciesAvailable.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ include(FetchContent)
22

33
include(LoadEigen)
44
include(LoadSpdlog)
5-
include(LoadDataManagement)
65

76
if(RESPOND_BUILD_TESTS STREQUAL "ON")
87
include(LoadGtest)
9-
FetchContent_MakeAvailable(Eigen3 spdlog datamanagement googletest)
8+
FetchContent_MakeAvailable(Eigen3 spdlog googletest)
109
include(GoogleTest)
1110
elseif(RESPOND_BUILD_TESTS STREQUAL "OFF")
12-
FetchContent_MakeAvailable(Eigen3 spdlog datamanagement)
11+
FetchContent_MakeAvailable(Eigen3 spdlog)
1312
endif()

cmake/options.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ option(RESPOND_BUILD_ALL "Build all artifacts" OFF)
33
# build position independent code
44
option(RESPOND_BUILD_PIC "Build position independent code (-fPIC)" OFF)
55

6-
option(RESPOND_BUILD_EXECUTABLE "Build Executable for RESPOND" ON)
7-
86
# testing options
97
option(RESPOND_BUILD_TESTS "Build tests" ON)
108

cmake/respond.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ Description: Syndemics Modeling Library
88
URL: https://github.com/SyndemicsLab
99
Version: @RESPOND_VERSION@
1010
CFlags: -I${includedir} @PKG_CONFIG_DEFINES@
11-
Libs: -L${libdir} -lspdlog -leigen -ldatamanagement
11+
Libs: -L${libdir} -lspdlog -leigen
1212
Requires: @PKG_CONFIG_REQUIRES@

cmake/respondConfig.cmake.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
include(CMakeFindDependencyMacro)
44
find_dependency(Eigen3)
55
find_dependency(spdlog)
6-
find_dependency(datamanagement)
76

87
include("${CMAKE_CURRENT_LIST_DIR}/respondConfigTargets.cmake")
98

0 commit comments

Comments
 (0)