modifs

CMakeLists.txt

@@ -15,11 +15,7 @@ message(STATUS "Building Petri Net parser ...")
 include_directories("${PARSER_DIR}/src")
 add_subdirectory(${PARSER_DIR})
 
-# add buddy
-set(BUDDY_DIR "${CMAKE_SOURCE_DIR}/third-party/buddy")
-message(STATUS "Building BuDDy library ...")
-include_directories("${BUDDY_DIR}/src")
-add_subdirectory(third-party/buddy)
+
 
 # add sylvan
 message(STATUS "Building Sylvan ...")

libraries/parser/LICENSE → LICENSE

@@ -631,7 +631,7 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    PN-Parser
+    Hybrid-SOG
     Copyright (C) 2019  PMC-SOG
 
     This program is free software: you can redistribute it and/or modify
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    PN-Parser  Copyright (C) 2019  PMC-SOG
+    Hybrid-SOG  Copyright (C) 2019  PMC-SOG
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

README.md

@@ -19,13 +19,11 @@ This repository hosts the experiments and results for the Hybrid (MPI/pthreads)
 
 
 
-All experiments were performed on a [Magi cluster](http://www.univ-paris13.fr/calcul/wiki/) of Paris 13 university. Some results are reported in [Resutls directory](https://depot.lipn.univ-paris13.fr/PMC-SOG/hybrid-sog/blob/master/Results/Experiments-Hybrid.pdf).
-
 
 ## Building
 
 
-- `git clone --recursive https://depot.lipn.univ-paris13.fr/PMC-SOG/hybrid-sog.git`
+- `git clone --recursive https://depot.lipn.univ-paris13.fr/PMC-SOG/mc-sog.git`
 
 - `mkdir build`
 
@@ -37,10 +35,10 @@ All experiments were performed on a [Magi cluster](http://www.univ-paris13.fr/ca
 
 
 ## Testing
-Interactive submission of the job  (philo5 example) using 2 processes * 12 threads:
+SOG building from an LTL formula (philo3.net example)
 
 ```
-mpirun -n 2 ./hybrid-sog arg1 arg 2 arg3 arg4
+mpirun -n 2 hybrid-sog arg1 arg 2 arg3 arg4
 arg1: specifies method of creating threads. It can be set with one of the following values:
      * p : using pthread library
      * pc : using pthread library and applying canonization on nodes
@@ -48,20 +46,7 @@ arg1: specifies method of creating threads. It can be set with one of the follow
      * lc : using lace framework and applying canonization on nodes
 arg2: specifies the number of threads/workers to be created
 arg3: specifies the net to build its SOG
-arg4: specifies the set of observable transitions
-
+arg4: specifies the LTL formula
 
-mpirun -n 2 ./hybrid-sog pc 12 philo5.net Obs5_philo
-```
 
-A sample job submission script for our home cluster using 2 nodes * 12 cores (for the same example in batch mode) :
-
-```
-#!/bin/bash
-#SBATCH --job-name=philo5
-#SBATCH --output=philo5.out
-#SBATCH --error=philo5.err
-#SBATCH --ntasks=2
-#SBATCH --cpus-per-task=12
-srun ./hybrid-sog pc 12 philo5.net Obs5_philo 32
 ```

libraries/parser/.gitignore

-
-# Created by https://www.gitignore.io/api/c++
-
-### C++ ###
-# Prerequisites
-*.d
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-
-# Extra compilation files
-*.lex.c
-*.tab.cpp
-*.tab.h
-
-# End of https://www.gitignore.io/api/c++
-
-
-# Created by https://www.gitignore.io/api/cmake
-# Edit at https://www.gitignore.io/?templates=cmake
-
-### CMake ###
-CMakeLists.txt.user
-CMakeCache.txt
-CMakeFiles
-CMakeScripts
-Testing
-Makefile
-cmake_install.cmake
-install_manifest.txt
-compile_commands.json
-CTestTestfile.cmake
-build
-
-# End of https://www.gitignore.io/api/cmake

libraries/parser/CMakeLists.txt

-# set minimum cmake version
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-
-# project name and language
-project(pn-parser LANGUAGES CXX)
-
-# variables
-set(SRC_DIR "${PROJECT_SOURCE_DIR}/src")
-set(EXAMPLES_DIR "${PROJECT_SOURCE_DIR}/examples")
-
-# add source folder
-include_directories (${SRC_DIR})
-add_subdirectory(src)
-
-# add tests
-enable_testing()
-add_subdirectory(tests)

libraries/parser/README.md

-# PN-Parser
-
-# Build
-
-```
-mkdir build && cd build
-cmake ..
-make
-```
-
-# Dependencies
-
-- `flex`
-- `bison`

libraries/parser/examples/AllObs1

-4
-T1_0 T2_0 T3_0 T4_0

libraries/parser/examples/AllObs10

-40
-T1_0 T2_0 T3_0 T4_0 T1_1 T2_1 T3_1 T4_1 T1_2 T2_2 T3_2 T4_2 T1_3 T2_3 T3_3 T4_3 T1_4 T2_4 T3_4 T4_4 T1_5 T2_5 T3_5 T4_5 T1_6 T2_6 T3_6 T4_6 T1_7 T2_7 T3_7 T4_7 T1_8 T2_8 T3_8 T4_8 T1_9 T2_9 T3_9 T4_9
\ No newline at end of file

libraries/parser/examples/AllObs2

-8
-T1_0 T2_0 T3_0 T4_0 T1_1 T2_1 T3_1 T4_1

libraries/parser/examples/AllObs20

-80
-T1_0 T2_0 T3_0 T4_0 T1_1 T2_1 T3_1 T4_1 T1_2 T2_2 T3_2 T4_2 T1_3 T2_3 T3_3 T4_3 T1_4 T2_4 T3_4 T4_4 T1_5 T2_5 T3_5 T4_5 T1_6 T2_6 T3_6 T4_6 T1_7 T2_7 T3_7 T4_7 T1_8 T2_8 T3_8 T4_8 T1_9 T2_9 T3_9 T4_9 T1_10 T2_10 T3_10 T4_10 T1_11 T2_11 T3_11 T4_11 T1_12 T2_12 T3_12 T4_12 T1_13 T2_13 T3_13 T4_13 T1_14 T2_14 T3_14 T4_14 T1_15 T2_15 T3_15 T4_15 T1_16 T2_16 T3_16 T4_16 T1_17 T2_17 T3_17 T4_17 T1_18 T2_18 T3_18 T4_18 T1_19 T2_19 T3_19 T4_19
\ No newline at end of file

libraries/parser/examples/AllObs3

-12
-T1_0 T2_0 T3_0 T4_0 T1_1 T2_1 T3_1 T4_1 T1_2 T2_2 T3_2 T4_2
\ No newline at end of file

libraries/parser/examples/AllObs4

-16
-T1_0 T2_0 T3_0 T4_0 T1_1 T2_1 T3_1 T4_1 T1_2 T2_2 T3_2 T4_2 T1_3 T2_3 T3_3 T4_3

libraries/parser/examples/AllObs5

-20
-T1_0 T2_0 T3_0 T4_0 T1_1 T2_1 T3_1 T4_1 T1_2 T2_2 T3_2 T4_2 T1_3 T2_3 T3_3 T4_3 T1_4 T2_4 T3_4 T4_4
-

libraries/parser/examples/AllObs6

-24
-T1_0 T2_0 T3_0 T4_0 T1_1 T2_1 T3_1 T4_1 T1_2 T2_2 T3_2 T4_2 T1_3 T2_3 T3_3 T4_3 T1_4 T2_4 T3_4 T4_4 T1_5 T2_5 T3_5 T4_5
-
-

libraries/parser/examples/AllObs7

-28
-T1_0 T2_0 T3_0 T4_0 T1_1 T2_1 T3_1 T4_1 T1_2 T2_2 T3_2 T4_2 T1_3 T2_3 T3_3 T4_3 T1_4 T2_4 T3_4 T4_4 T1_5 T2_5 T3_5 T4_5 T1_6 T2_6 T3_6 T4_6

libraries/parser/examples/AllObs8

-32
-T1_0 T2_0 T3_0 T4_0 T1_1 T2_1 T3_1 T4_1 T1_2 T2_2 T3_2 T4_2 T1_3 T2_3 T3_3 T4_3 T1_4 T2_4 T3_4 T4_4 T1_5 T2_5 T3_5 T4_5 T1_6 T2_6 T3_6 T4_6 T1_7 T2_7 T3_7 T4_7

libraries/parser/examples/AllObs9

-36
-T1_0 T2_0 T3_0 T4_0 T1_1 T2_1 T3_1 T4_1 T1_2 T2_2 T3_2 T4_2 T1_3 T2_3 T3_3 T4_3 T1_4 T2_4 T3_4 T4_4 T1_5 T2_5 T3_5 T4_5 T1_6 T2_6 T3_6 T4_6 T1_7 T2_7 T3_7 T4_7 T1_8 T2_8 T3_8 T4_8
\ No newline at end of file

libraries/parser/examples/AllPeter2

-12
-start_0   start_1  bc_0_1_0  bc_0_1_1    bc_1_1_0   bc_1_1_1   ccs_1_0_0   ccs_0_1_0   ccsturn_0_1_1    ccsturn_1_0_0   csinit_0    csinit_1
-

libraries/parser/examples/AllPeter3

-69
-start_0 start_1 start_2 ab_0_2 ab_1_2 ab_2_2 bc_0_1_0 bc_0_2_0 bc_0_1_1 bc_0_2_1 bc_0_1_2 bc_0_2_2 bc_1_1_0 bc_1_2_0 bc_1_1_1 bc_1_2_1 bc_1_1_2 bc_1_2_2 bc_2_1_0 bc_2_2_0 bc_2_1_1 bc_2_2_1 bc_2_1_2 bc_2_2_2 cc_0_1_1_0 cc_0_2_1_0 cc_0_2_1_1 cc_1_1_2_0 cc_1_2_2_0 cc_1_2_2_1 cc_2_1_0_0 cc_2_2_0_0 cc_2_2_0_1 cc_1_1_0_0 cc_2_1_1_0 cc_0_1_2_0 ccs_1_0_0 ccs_1_0_1 ccs_2_1_0 ccs_2_1_1 ccs_0_2_0 ccs_0_2_1 caturn_0_1_1_1 caturn_0_1_1_2 caturn_0_1_2_1 caturn_0_1_2_2 caturn_1_1_0_0 caturn_1_1_0_2 caturn_1_1_2_0 caturn_1_1_2_2 caturn_2_1_0_0 caturn_2_1_0_1 caturn_2_1_1_0 caturn_2_1_1_1 ccsturn_0_1_1 ccsturn_0_1_2 ccsturn_0_2_1 ccsturn_0_2_2 ccsturn_1_0_0 ccsturn_1_0_2 ccsturn_1_2_0 ccsturn_1_2_2 ccsturn_2_0_0 ccsturn_2_0_1 ccsturn_2_1_0 ccsturn_2_1_1 csinit_0 csinit_1 csinit_2
\ No newline at end of file

libraries/parser/examples/AllPeter4

-244
- start_0
- start_1
- start_2
- start_3
- ab_0_2
- ab_0_3
- ab_1_2
- ab_1_3
- ab_2_2
- ab_2_3
- ab_3_2
- ab_3_3
- bc_0_1_0
- bc_0_2_0
- bc_0_3_0
- bc_0_1_1
- bc_0_2_1
- bc_0_3_1
- bc_0_1_2
- bc_0_2_2
- bc_0_3_2
- bc_0_1_3
- bc_0_2_3
- bc_0_3_3
- bc_1_1_0
- bc_1_2_0
- bc_1_3_0
- bc_1_1_1
- bc_1_2_1
- bc_1_3_1
- bc_1_1_2
- bc_1_2_2
- bc_1_3_2
- bc_1_1_3
- bc_1_2_3
- bc_1_3_3
- bc_2_1_0
- bc_2_2_0
- bc_2_3_0
- bc_2_1_1
- bc_2_2_1
- bc_2_3_1
- bc_2_1_2
- bc_2_2_2
- bc_2_3_2
- bc_2_1_3
- bc_2_2_3
- bc_2_3_3
- bc_3_1_0
- bc_3_2_0
- bc_3_3_0
- bc_3_1_1
- bc_3_2_1
- bc_3_3_1
- bc_3_1_2
- bc_3_2_2
- bc_3_3_2
- bc_3_1_3
- bc_3_2_3
- bc_3_3_3
- cc_0_1_1_0
- cc_0_2_1_0
- cc_0_2_1_1
- cc_0_3_1_0
- cc_0_3_1_1
- cc_0_3_1_2
- cc_0_1_2_0
- cc_0_2_2_0
- cc_0_2_2_1
- cc_0_3_2_0
- cc_0_3_2_1
- cc_0_3_2_2
- cc_1_1_2_0
- cc_1_2_2_0
- cc_1_2_2_1
- cc_1_3_2_0
- cc_1_3_2_1
- cc_1_3_2_2
- cc_1_1_3_0
- cc_1_2_3_0
- cc_1_2_3_1
- cc_1_3_3_0
- cc_1_3_3_1
- cc_1_3_3_2
- cc_2_1_0_0
- cc_2_2_0_0
- cc_2_2_0_1
- cc_2_3_0_0
- cc_2_3_0_1
- cc_2_3_0_2
- cc_2_1_3_0
- cc_2_2_3_0
- cc_2_2_3_1
- cc_2_3_3_0
- cc_2_3_3_1
- cc_2_3_3_2
- cc_3_1_0_0
- cc_3_2_0_0
- cc_3_2_0_1
- cc_3_3_0_0
- cc_3_3_0_1
- cc_3_3_0_2
- cc_3_1_1_0
- cc_3_2_1_0
- cc_3_2_1_1
- cc_3_3_1_0
- cc_3_3_1_1
- cc_3_3_1_2
- cc_1_1_0_0
- cc_1_2_0_0
- cc_1_2_0_1
- cc_2_1_1_0
- cc_2_2_1_0
- cc_2_2_1_1
- cc_3_1_2_0
- cc_3_2_2_0
- cc_3_2_2_1
- cc_0_1_3_0
- cc_0_2_3_0
- cc_0_2_3_1
- ccs_1_0_0
- ccs_1_0_1
- ccs_1_0_2
- ccs_2_1_0
- ccs_2_1_1
- ccs_2_1_2
- ccs_3_2_0
- ccs_3_2_1
- ccs_3_2_2
- ccs_0_3_0
- ccs_0_3_1
- ccs_0_3_2
- caturn_0_1_1_1
- caturn_0_1_1_2
- caturn_0_1_1_3
- caturn_0_2_1_1
- caturn_0_2_1_2
- caturn_0_2_1_3
- caturn_0_1_2_1
- caturn_0_1_2_2
- caturn_0_1_2_3
- caturn_0_2_2_1
- caturn_0_2_2_2
- caturn_0_2_2_3
- caturn_0_1_3_1
- caturn_0_1_3_2
- caturn_0_1_3_3
- caturn_0_2_3_1
- caturn_0_2_3_2
- caturn_0_2_3_3
- caturn_1_1_0_0
- caturn_1_1_0_2
- caturn_1_1_0_3
- caturn_1_2_0_0
- caturn_1_2_0_2
- caturn_1_2_0_3
- caturn_1_1_2_0
- caturn_1_1_2_2
- caturn_1_1_2_3
- caturn_1_2_2_0
- caturn_1_2_2_2
- caturn_1_2_2_3
- caturn_1_1_3_0
- caturn_1_1_3_2
- caturn_1_1_3_3
- caturn_1_2_3_0
- caturn_1_2_3_2
- caturn_1_2_3_3
- caturn_2_1_0_0
- caturn_2_1_0_1
- caturn_2_1_0_3
- caturn_2_2_0_0
- caturn_2_2_0_1
- caturn_2_2_0_3
- caturn_2_1_1_0
- caturn_2_1_1_1
- caturn_2_1_1_3
- caturn_2_2_1_0
- caturn_2_2_1_1
- caturn_2_2_1_3
- caturn_2_1_3_0
- caturn_2_1_3_1
- caturn_2_1_3_3
- caturn_2_2_3_0
- caturn_2_2_3_1
- caturn_2_2_3_3
- caturn_3_1_0_0
- caturn_3_1_0_1
- caturn_3_1_0_2
- caturn_3_2_0_0
- caturn_3_2_0_1
- caturn_3_2_0_2
- caturn_3_1_1_0
- caturn_3_1_1_1
- caturn_3_1_1_2
- caturn_3_2_1_0
- caturn_3_2_1_1
- caturn_3_2_1_2
- caturn_3_1_2_0
- caturn_3_1_2_1
- caturn_3_1_2_2
- caturn_3_2_2_0
- caturn_3_2_2_1
- caturn_3_2_2_2
- ccsturn_0_1_1
- ccsturn_0_1_2
- ccsturn_0_1_3
- ccsturn_0_2_1
- ccsturn_0_2_2
- ccsturn_0_2_3
- ccsturn_0_3_1
- ccsturn_0_3_2
- ccsturn_0_3_3
- ccsturn_1_0_0
- ccsturn_1_0_2
- ccsturn_1_0_3
- ccsturn_1_2_0
- ccsturn_1_2_2
- ccsturn_1_2_3
- ccsturn_1_3_0
- ccsturn_1_3_2
- ccsturn_1_3_3
- ccsturn_2_0_0
- ccsturn_2_0_1
- ccsturn_2_0_3
- ccsturn_2_1_0
- ccsturn_2_1_1
- ccsturn_2_1_3
- ccsturn_2_3_0
- ccsturn_2_3_1
- ccsturn_2_3_3
- ccsturn_3_0_0
- ccsturn_3_0_1
- ccsturn_3_0_2
- ccsturn_3_1_0
- ccsturn_3_1_1
- ccsturn_3_1_2
- ccsturn_3_2_0
- ccsturn_3_2_1
- ccsturn_3_2_2
- csinit_0
- csinit_1
- csinit_2
- csinit_3
\ No newline at end of file