Skip to content

Commit

Permalink
Merge pull request #1 from kevindadi/tdg_rap_2_ptpn
Browse files Browse the repository at this point in the history
Tdg rap 2 ptpn
  • Loading branch information
kevindadi authored Mar 28, 2024
2 parents d6a5fea + 9c28ce4 commit a8666e9
Show file tree
Hide file tree
Showing 28 changed files with 1,387 additions and 6,532 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
/.idea
/build
/new_build
/CMakeLists.txt
/CMakeLists.txt
/.vscode
19 changes: 9 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ if (BOOST_FOUND)
endif ()

include(FetchContent)

include_directories(include)
FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz)
FetchContent_MakeAvailable(json)
# find_package(nlohmann_json CONFIG REQUIRED)
# link_directories("/usr/local/opt/graphviz/lib")
# add_executable(PTPN main.cpp petrinet.cpp petrinet.h config.cpp config.h timepetrinet.cpp timepetrinet.h
# StateClass.h StateClass.cpp)
add_executable(PPTPN main.cpp petrinet.cpp petrinet.h probpetrinet.cpp probpetrinet.h GConfig.cpp
GConfig.h config.cpp config.h timepetrinet.cpp timepetrinet.h StateClass.h StateClass.cpp)
# target_link_libraries(PTPN Boost::graph Boost::log Boost::program_options)
target_link_libraries(PPTPN Boost::graph Boost::log gvc cgraph Boost::program_options nlohmann_json::nlohmann_json)
#add_test(test/test_sub_task.cpp Boost::graph)
add_executable(PTPN main.cpp include/clap.h include/dag.h src/clap.cpp
include/priority_time_petri_net.h
src/priority_time_petri_net.cpp
include/state_class_graph.h
src/state_class_graph.cpp
include/owner_assert.h)
target_link_libraries(PTPN Boost::graph Boost::log Boost::program_options)

285 changes: 0 additions & 285 deletions GConfig.cpp

This file was deleted.

Loading

0 comments on commit a8666e9

Please sign in to comment.