Skip to content

Commit

Permalink
Update subproject commit in extern/riddle and add new GOAC test cases…
Browse files Browse the repository at this point in the history 
… in CMakeLists.txt
  • Loading branch information
@riccardodebenedictis
riccardodebenedictis committed Nov 11, 2024
1 parent 267c935 commit dad748d
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
2 changes: 1 addition & 1 deletion extern/riddle
Submodule riddle updated 3 files
+0 −1 include/declaration.hpp
+0 −3 src/compilation_unit.cpp
+6 −10 src/declaration.cpp
26 changes: 26 additions & 0 deletions tests/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,31 @@ if(TEMPORAL_NETWORK_TYPE STREQUAL LRA)
add_test(NAME LMTest00 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/lm/domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/lm/lm_00.rddl" "solution.json")
add_test(NAME LMTest01 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/lm/domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/lm/lm_01.rddl" "solution.json")
add_test(NAME LMTest02 COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/lm/domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/lm/lm_02.rddl" "solution.json")

add_test(NAME GOAC_1Pic_1Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_1pic_1wind.rddl" "solution.json")
add_test(NAME GOAC_1Pic_2Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_1pic_2wind.rddl" "solution.json")
add_test(NAME GOAC_1Pic_3Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_1pic_3wind.rddl" "solution.json")
add_test(NAME GOAC_1Pic_4Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_1pic_4wind.rddl" "solution.json")
add_test(NAME GOAC_1Pic_5Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_1pic_5wind.rddl" "solution.json")
add_test(NAME GOAC_2Pic_1Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_2pic_1wind.rddl" "solution.json")
add_test(NAME GOAC_2Pic_2Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_2pic_2wind.rddl" "solution.json")
add_test(NAME GOAC_2Pic_3Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_2pic_3wind.rddl" "solution.json")
add_test(NAME GOAC_2Pic_4Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_2pic_4wind.rddl" "solution.json")
add_test(NAME GOAC_2Pic_5Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_2pic_5wind.rddl" "solution.json")
add_test(NAME GOAC_3Pic_1Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_3pic_1wind.rddl" "solution.json")
add_test(NAME GOAC_3Pic_2Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_3pic_2wind.rddl" "solution.json")
add_test(NAME GOAC_3Pic_3Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_3pic_3wind.rddl" "solution.json")
add_test(NAME GOAC_3Pic_4Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_3pic_4wind.rddl" "solution.json")
add_test(NAME GOAC_3Pic_5Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_3pic_5wind.rddl" "solution.json")
add_test(NAME GOAC_4Pic_1Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_4pic_1wind.rddl" "solution.json")
add_test(NAME GOAC_4Pic_2Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_4pic_2wind.rddl" "solution.json")
add_test(NAME GOAC_4Pic_3Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_4pic_3wind.rddl" "solution.json")
add_test(NAME GOAC_4Pic_4Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_4pic_4wind.rddl" "solution.json")
add_test(NAME GOAC_4Pic_5Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_4pic_5wind.rddl" "solution.json")
add_test(NAME GOAC_5Pic_1Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_5pic_1wind.rddl" "solution.json")
add_test(NAME GOAC_5Pic_2Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_5pic_2wind.rddl" "solution.json")
add_test(NAME GOAC_5Pic_3Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_5pic_3wind.rddl" "solution.json")
add_test(NAME GOAC_5Pic_4Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_5pic_4wind.rddl" "solution.json")
add_test(NAME GOAC_5Pic_5Wind COMMAND solver_tests "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_domain.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/map.rddl" "${PROJECT_SOURCE_DIR}/extern/riddle/examples/goac/goac_5pic_5wind.rddl" "solution.json")
elseif(TEMPORAL_NETWORK_TYPE STREQUAL DL)
endif()

0 comments on commit dad748d

Please sign in to comment.