Skip to content

Commit 61cf74a

Browse files
committed
Rename fuzz test and remove hardcoded path from example program
1 parent 24aed89 commit 61cf74a

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

example/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
find_package(fmt REQUIRED)
22

3+
add_compile_definitions(DATA_STORAGE_PATH="${CMAKE_SOURCE_DIR}/data")
4+
35
add_executable(main main.cpp)
46
target_link_libraries(main PRIVATE cecxx fmt::fmt)
57
set_target_properties(main PROPERTIES CXX_STANDARD 20)
6-
target_compile_options(main PRIVATE -Wall -Wextra -Wpedantic -O3)
8+
target_compile_options(main PRIVATE -Wall -Wextra -Wpedantic -Werror -O3)
79

example/main.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
#include "cecxx/benchmark/evaluator.hpp"
1212

13-
constexpr auto CEC_STORAGE{"/home/ewarchul/open-source/optim/cecxx/data"};
14-
1513
namespace rv = ranges::views;
1614
using namespace cecxx;
1715

@@ -20,8 +18,9 @@ auto main() -> int {
2018
const auto dimensions = std::vector{10ul, 30ul, 50ul, 100ul};
2119

2220
// Create an evaluator object for the CEC2017 benchmark
23-
auto cec2017_eval = benchmark::evaluator(
24-
cecxx::benchmark::cec_edition_t::cec2017, dimensions, CEC_STORAGE);
21+
auto cec2017_eval =
22+
benchmark::evaluator(cecxx::benchmark::cec_edition_t::cec2017,
23+
dimensions, DATA_STORAGE_PATH);
2524

2625
// create problem grid [problem_number X dimension]
2726
const auto problem_grid =

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fuzztest_setup_fuzzing_flags()
1313

1414
add_compile_definitions(DATA_STORAGE_PATH="${CMAKE_SOURCE_DIR}/data")
1515

16-
add_executable(cecxx-fuzz gtest/cec2017_oracle_test.cpp oracle/cec2017.cpp)
16+
add_executable(cecxx-fuzz gtest/cec2017_oracle_compliance_test.cpp oracle/cec2017.cpp)
1717
target_include_directories(cecxx-fuzz PUBLIC .)
1818
target_link_libraries(cecxx-fuzz PRIVATE cecxx)
1919

test/gtest/cec2017_oracle_test.cpp renamed to test/gtest/cec2017_oracle_compliance_test.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ constexpr auto MAX_ABS_ERROR = 1e-8;
2222
constexpr auto CEC_2017_LOWER_BOUND = -100.0;
2323
constexpr auto CEC_2017_UPPER_BOUND = 100.0;
2424

25-
class Cec2017ConformanceTest
25+
class Cec2017ComplianceTest
2626
: public PerFuzzTestFixtureAdapter<
2727
CecTestFixture<cec_edition_t::cec2017, 10, 30, 50, 100>> {
2828
public:
@@ -51,25 +51,25 @@ class Cec2017ConformanceTest
5151
}
5252
};
5353

54-
FUZZ_TEST_F(Cec2017ConformanceTest, Cec2017D10ImplsAreEquiv)
54+
FUZZ_TEST_F(Cec2017ComplianceTest, Cec2017D10ImplsAreEquiv)
5555
.WithDomains(PositiveVectorOf<double>(InRange(CEC_2017_LOWER_BOUND,
5656
CEC_2017_UPPER_BOUND))
5757
.WithSize(10),
5858
InCecProblemRange(cec_edition_t::cec2017));
5959

60-
FUZZ_TEST_F(Cec2017ConformanceTest, Cec2017D30ImplsAreEquiv)
60+
FUZZ_TEST_F(Cec2017ComplianceTest, Cec2017D30ImplsAreEquiv)
6161
.WithDomains(PositiveVectorOf<double>(InRange(CEC_2017_LOWER_BOUND,
6262
CEC_2017_UPPER_BOUND))
6363
.WithSize(30),
6464
InCecProblemRange(cec_edition_t::cec2017));
6565

66-
FUZZ_TEST_F(Cec2017ConformanceTest, Cec2017D50ImplsAreEquiv)
66+
FUZZ_TEST_F(Cec2017ComplianceTest, Cec2017D50ImplsAreEquiv)
6767
.WithDomains(PositiveVectorOf<double>(InRange(CEC_2017_LOWER_BOUND,
6868
CEC_2017_UPPER_BOUND))
6969
.WithSize(50),
7070
InCecProblemRange(cec_edition_t::cec2017));
7171

72-
FUZZ_TEST_F(Cec2017ConformanceTest, Cec2017D100ImplsAreEquiv)
72+
FUZZ_TEST_F(Cec2017ComplianceTest, Cec2017D100ImplsAreEquiv)
7373
.WithDomains(PositiveVectorOf<double>(InRange(CEC_2017_LOWER_BOUND,
7474
CEC_2017_UPPER_BOUND))
7575
.WithSize(100),

0 commit comments

Comments
 (0)