Skip to content

Commit

Permalink
improved optimization benchmarks..
Browse files Browse the repository at this point in the history
  • Loading branch information
@riccardodebenedictis
riccardodebenedictis committed Sep 23, 2023
1 parent 0eedcc4 commit 8fca252
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 29 deletions.
2 changes: 1 addition & 1 deletion extern/riddle
Submodule riddle updated 15 files
+0 −4 examples/optimization/physical_exercises_01.rddl
+0 −16 examples/optimization/physical_exercises_05.rddl
+0 −46 examples/optimization/physical_exercises_15.rddl
+0 −76 examples/optimization/physical_exercises_25.rddl
+0 −106 examples/optimization/physical_exercises_35.rddl
+45 −0 examples/optimization/physical_exercises_70.rddl
+105 −0 examples/optimization/physical_exercises_80.rddl
+0 −7 examples/optimization/physical_exercises_free_01.rddl
+0 −26 examples/optimization/physical_exercises_free_05.rddl
+0 −76 examples/optimization/physical_exercises_free_15.rddl
+0 −126 examples/optimization/physical_exercises_free_25.rddl
+0 −176 examples/optimization/physical_exercises_free_35.rddl
+75 −0 examples/optimization/physical_exercises_free_70.rddl
+175 −0 examples/optimization/physical_exercises_free_80.rddl
+16 −26 tests/CMakeLists.txt
45 changes: 17 additions & 28 deletions tests/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ add_executable(solver_tests test_solver.cpp)
add_dependencies(solver_tests oRatioSolver)
target_link_libraries(solver_tests PRIVATE oRatioSolver)

target_compile_definitions(solver_tests PRIVATE NUM_TESTS=10)
target_compile_definitions(solver_tests PRIVATE NUM_TESTS=1)

if(TEMPORAL_NETWORK_TYPE STREQUAL LA)
add_test(NAME SolverTest00 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/core/example_00.rddl" "solution.json")
Expand Down Expand Up @@ -128,33 +128,22 @@ if(TEMPORAL_NETWORK_TYPE STREQUAL LA)
add_test(NAME UI_03_27 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/urban_intelligence/urban_intelligence_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/urban_intelligence/urban_intelligence_03_27.rddl" "solution.json")
add_test(NAME UI_03_30 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/urban_intelligence/urban_intelligence_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/urban_intelligence/urban_intelligence_03_30.rddl" "solution.json")

add_test(NAME Opt_01 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_01.rddl")
add_test(NAME Opt_02 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_05.rddl")
add_test(NAME Opt_03 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_10.rddl")
add_test(NAME Opt_04 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_15.rddl")
add_test(NAME Opt_05 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_20.rddl")
add_test(NAME Opt_06 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_25.rddl")
add_test(NAME Opt_07 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_30.rddl")
add_test(NAME Opt_08 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_35.rddl")
add_test(NAME Opt_09 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_40.rddl")
add_test(NAME Opt_10 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_45.rddl")
add_test(NAME Opt_11 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_50.rddl")
add_test(NAME Opt_12 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_55.rddl")
add_test(NAME Opt_13 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_60.rddl")

add_test(NAME OptFree_01 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_01.rddl")
add_test(NAME OptFree_02 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_05.rddl")
add_test(NAME OptFree_03 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_10.rddl")
add_test(NAME OptFree_04 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_15.rddl")
add_test(NAME OptFree_05 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_20.rddl")
add_test(NAME OptFree_06 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_25.rddl")
add_test(NAME OptFree_07 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_30.rddl")
add_test(NAME OptFree_08 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_35.rddl")
add_test(NAME OptFree_09 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_40.rddl")
add_test(NAME OptFree_10 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_45.rddl")
add_test(NAME OptFree_11 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_50.rddl")
add_test(NAME OptFree_12 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_55.rddl")
add_test(NAME OptFree_13 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_60.rddl")
add_test(NAME Opt_01 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_10.rddl")
add_test(NAME Opt_02 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_20.rddl")
add_test(NAME Opt_03 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_30.rddl")
add_test(NAME Opt_04 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_40.rddl")
add_test(NAME Opt_05 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_50.rddl")
add_test(NAME Opt_06 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_60.rddl")
add_test(NAME Opt_07 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_70.rddl")
add_test(NAME Opt_08 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_80.rddl")

add_test(NAME OptFree_01 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_10.rddl")
add_test(NAME OptFree_02 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_20.rddl")
add_test(NAME OptFree_03 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_30.rddl")
add_test(NAME OptFree_04 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_40.rddl")
add_test(NAME OptFree_05 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_50.rddl")
add_test(NAME OptFree_06 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_60.rddl")
add_test(NAME OptFree_07 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_70.rddl")
add_test(NAME OptFree_08 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/optimization/physical_exercises_domain.rddl" "${PROJECT_SOURCE_DIR}/examples/optimization/physical_exercises_free_80.rddl")
elseif(TEMPORAL_NETWORK_TYPE STREQUAL DL)
endif()

0 comments on commit 8fca252

Please sign in to comment.