Skip to content

Commit b7c73fe

Browse files
authored
Merge branch 'ZigRazor:master' into master
2 parents 4bfa986 + b7742a9 commit b7c73fe

File tree

133 files changed

+630
-239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+630
-239
lines changed

.github/labeler.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# Add 'repo' label to any root file changes
22
repo:
3-
- '*'
4-
3+
- owner:SunHappyboy
4+
name:CXXGraph
5+
labels:
6+
-name:bug
7+
color:ffb4b4
58
# Add 'test' label to any change to *.spec.js files within the source dir
69
test:
710
- test/**

.github/workflows/Code_Coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
working-directory: ${{github.workspace}}/build/test
5050
run: lcov --capture --directory .. --output-file coverage.info
5151

52-
- uses: codecov/codecov-action@v4.5.0
52+
- uses: codecov/codecov-action@v5.3.1
5353
with:
5454
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
5555
file: ${{github.workspace}}/build/test/coverage.info # optional

.github/workflows/Doxygen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
git push origin documentation-update-${{ steps.buildnumber.outputs.build_number }}
3939
4040
- name: Doxygen Action
41-
uses: mattnotmitt/doxygen-action@v1.9.8
41+
uses: mattnotmitt/doxygen-action@v1.12.0
4242
with:
4343
# Working directory
4444
working-directory: 'docs/'

.github/workflows/clang_format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v4
2222
- name: Run clang-format style check
23-
uses: jidicula/clang-format-action@v4.13.0
23+
uses: jidicula/clang-format-action@v4.14.0
2424
with:
2525
clang-format-version: '16'
2626
check-path: ${{ matrix.path }}

.github/workflows/cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ jobs:
5656
working-directory: ${{github.workspace}}/build/test
5757
# Execute tests defined by the CMake configuration.
5858
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
59-
run: ctest -C
59+
run: ctest
6060

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,6 @@ build/
3636
# ignore the packaging folder contents from git
3737
packaging/
3838
# ignore vscode files
39-
.vscode
39+
.vscode
40+
.code-workspace
41+
CXXGraph.code-workspace

CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@ if(DEBUG)
1919
)
2020
endif(DEBUG)
2121

22+
option(SANITIZE "Enable Sanitize" OFF)
23+
if(SANITIZE)
24+
add_compile_options(
25+
-fsanitize=address
26+
-fsanitize=leak
27+
)
28+
add_link_options(
29+
-fsanitize=address
30+
-fsanitize=leak
31+
)
32+
endif(SANITIZE)
33+
2234
# set up CPM.cmake
2335
if(CPM_SOURCE_CACHE)
2436
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM.cmake")

benchmark/BFS_BM.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ static void BFS_X(benchmark::State &state) {
1717
g.breadth_first_search(*(range_start->second->getNodePair().first));
1818
}
1919
}
20-
BENCHMARK(BFS_X)->RangeMultiplier(18)->Range((unsigned long)1,
21-
(unsigned long)1 << 18);
20+
BENCHMARK(BFS_X)
21+
->RangeMultiplier(18)
22+
->Range((unsigned long)1, (unsigned long)1 << 18)
23+
->Complexity();
2224

2325
static void BFS_FromReadedCitHep(benchmark::State &state) {
2426
auto edgeSet = cit_graph_ptr->getEdgeSet();
@@ -28,7 +30,7 @@ static void BFS_FromReadedCitHep(benchmark::State &state) {
2830
}
2931
}
3032

31-
BENCHMARK(BFS_FromReadedCitHep);
33+
BENCHMARK(BFS_FromReadedCitHep)->Complexity();
3234

3335
static void PSEUDO_CONCURRENCY_BFS_X(benchmark::State &state) {
3436
CXXGraph::Graph<int> g;
@@ -46,7 +48,8 @@ static void PSEUDO_CONCURRENCY_BFS_X(benchmark::State &state) {
4648
}
4749
BENCHMARK(PSEUDO_CONCURRENCY_BFS_X)
4850
->RangeMultiplier(18)
49-
->Range((unsigned long)1, (unsigned long)1 << 18);
51+
->Range((unsigned long)1, (unsigned long)1 << 18)
52+
->Complexity();
5053

5154
static void PSEUDO_CONCURRENCY_BFS_FromReadedCitHep(benchmark::State &state) {
5255
auto edgeSet = cit_graph_ptr->getEdgeSet();
@@ -56,7 +59,7 @@ static void PSEUDO_CONCURRENCY_BFS_FromReadedCitHep(benchmark::State &state) {
5659
}
5760
}
5861

59-
BENCHMARK(PSEUDO_CONCURRENCY_BFS_FromReadedCitHep);
62+
BENCHMARK(PSEUDO_CONCURRENCY_BFS_FromReadedCitHep)->Complexity();
6063

6164
static void CONCURRENCY_BFS_X(benchmark::State &state) {
6265
CXXGraph::Graph<int> g;
@@ -72,9 +75,9 @@ static void CONCURRENCY_BFS_X(benchmark::State &state) {
7275
*(range_start->second->getNodePair().first), 8);
7376
}
7477
}
75-
BENCHMARK(CONCURRENCY_BFS_X)
76-
->RangeMultiplier(18)
77-
->Range((unsigned long)1, (unsigned long)1 << 18);
78+
// BENCHMARK(CONCURRENCY_BFS_X)
79+
// ->RangeMultiplier(18)
80+
// ->Range((unsigned long)1, (unsigned long)1 << 18);
7881

7982
static void CONCURRENCY_BFS_FromReadedCitHep(benchmark::State &state) {
8083
auto edgeSet = cit_graph_ptr->getEdgeSet();
@@ -84,4 +87,4 @@ static void CONCURRENCY_BFS_FromReadedCitHep(benchmark::State &state) {
8487
}
8588
}
8689

87-
BENCHMARK(CONCURRENCY_BFS_FromReadedCitHep);
90+
// BENCHMARK(CONCURRENCY_BFS_FromReadedCitHep);

benchmark/BellmanFord_BM.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ static void BellmanFord_X(benchmark::State &state) {
1919
}
2020
BENCHMARK(BellmanFord_X)
2121
->RangeMultiplier(16)
22-
->Range((unsigned long)1, (unsigned long)1 << 16);
22+
->Range((unsigned long)1, (unsigned long)1 << 16)
23+
->Complexity();
2324

2425
static void BellmanFord_FromReadedCitHep(benchmark::State &state) {
2526
auto edgeSet = cit_graph_ptr->getEdgeSet();
@@ -30,4 +31,4 @@ static void BellmanFord_FromReadedCitHep(benchmark::State &state) {
3031
}
3132
}
3233

33-
BENCHMARK(BellmanFord_FromReadedCitHep);
34+
BENCHMARK(BellmanFord_FromReadedCitHep)->Complexity();

benchmark/Boruvka_BM.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ static void Boruvka_X(benchmark::State &state) {
1616
auto &result = g.boruvka();
1717
}
1818
}
19-
BENCHMARK(Boruvka_X)->RangeMultiplier(16)->Range((unsigned long)1,
20-
(unsigned long)1 << 16);
19+
BENCHMARK(Boruvka_X)
20+
->RangeMultiplier(16)
21+
->Range((unsigned long)1, (unsigned long)1 << 16)
22+
->Complexity();
2123

2224
static void Boruvka_FromReadedCitHep(benchmark::State &state) {
2325
auto edgeSet = cit_graph_ptr->getEdgeSet();
@@ -26,4 +28,4 @@ static void Boruvka_FromReadedCitHep(benchmark::State &state) {
2628
}
2729
}
2830

29-
BENCHMARK(Boruvka_FromReadedCitHep);
31+
BENCHMARK(Boruvka_FromReadedCitHep)->Complexity();

0 commit comments

Comments
 (0)