From 960447b2c3436d101325823d01172381cab4ef3b Mon Sep 17 00:00:00 2001 From: sjunges Date: Thu, 17 Nov 2016 23:03:21 +0100 Subject: [PATCH] moved storm-pgcl to a seperate lib; also slightly cleaned the code --- src/CMakeLists.txt | 2 ++ src/storm-pgcl-cli/CMakeLists.txt | 3 ++ src/{storm => storm-pgcl-cli}/storm-pgcl.cpp | 6 ++-- src/storm-pgcl/CMakeLists.txt | 8 +++++ .../builder/JaniProgramGraphBuilder.cpp | 0 .../builder/JaniProgramGraphBuilder.h | 5 ++-- .../builder/ProgramGraphBuilder.cpp | 12 ++++---- .../builder/ProgramGraphBuilder.h | 8 ++--- .../parser/PgclParser.cpp | 2 +- src/{storm => storm-pgcl}/parser/PgclParser.h | 20 ++++++------- .../storage/pgcl/AbstractStatementVisitor.h | 0 .../storage/pgcl/AssignmentStatement.cpp | 3 +- .../storage/pgcl/AssignmentStatement.h | 4 +-- .../storage/pgcl/Block.cpp | 0 .../storage/pgcl/Block.h | 4 +-- .../storage/pgcl/BooleanExpression.cpp | 2 +- .../storage/pgcl/BooleanExpression.h | 0 .../storage/pgcl/BranchStatement.cpp | 4 +-- .../storage/pgcl/BranchStatement.h | 4 +-- .../storage/pgcl/CompoundStatement.h | 2 +- .../storage/pgcl/IfStatement.cpp | 2 +- .../storage/pgcl/IfStatement.h | 6 ++-- .../storage/pgcl/LoopStatement.cpp | 4 +-- .../storage/pgcl/LoopStatement.h | 17 ++--------- .../storage/pgcl/NondeterministicBranch.cpp | 4 +-- .../storage/pgcl/NondeterministicBranch.h | 14 ++------- .../storage/pgcl/ObserveStatement.cpp | 4 +-- .../storage/pgcl/ObserveStatement.h | 4 +-- .../storage/pgcl/PgclProgram.cpp | 0 .../storage/pgcl/PgclProgram.h | 4 +-- .../storage/pgcl/ProbabilisticBranch.cpp | 4 +-- .../storage/pgcl/ProbabilisticBranch.h | 2 +- .../storage/pgcl/Statement.cpp | 6 ++-- .../storage/pgcl/Statement.h | 2 +- .../storage/pgcl/StatementPrinterVisitor.cpp | 14 ++++----- .../storage/pgcl/StatementPrinterVisitor.h | 2 +- .../storage/pgcl/UniformExpression.cpp | 0 .../storage/pgcl/UniformExpression.h | 0 .../storage/pgcl/VariableDeclaration.h | 0 .../storage/ppg/ProgramAction.cpp | 0 .../storage/ppg/ProgramAction.h | 0 .../storage/ppg/ProgramEdge.cpp | 0 .../storage/ppg/ProgramEdge.h | 0 .../storage/ppg/ProgramEdgeGroup.cpp | 0 .../storage/ppg/ProgramEdgeGroup.h | 0 .../storage/ppg/ProgramGraph.cpp | 0 .../storage/ppg/ProgramGraph.h | 2 +- .../storage/ppg/ProgramLocation.cpp | 0 .../storage/ppg/ProgramLocation.h | 0 .../storage/ppg/defines.h | 0 src/storm/CMakeLists.txt | 18 ++--------- src/storm/storage/pgcl/CompoundStatement.cpp | 15 ---------- src/storm/storage/pgcl/SimpleStatement.cpp | 15 ---------- src/storm/storage/pgcl/SimpleStatement.h | 30 ------------------- .../storage/pgcl/VariableDeclaration.cpp | 1 - 55 files changed, 90 insertions(+), 169 deletions(-) create mode 100644 src/storm-pgcl-cli/CMakeLists.txt rename src/{storm => storm-pgcl-cli}/storm-pgcl.cpp (96%) create mode 100644 src/storm-pgcl/CMakeLists.txt rename src/{storm => storm-pgcl}/builder/JaniProgramGraphBuilder.cpp (100%) rename src/{storm => storm-pgcl}/builder/JaniProgramGraphBuilder.h (99%) rename src/{storm => storm-pgcl}/builder/ProgramGraphBuilder.cpp (92%) rename src/{storm => storm-pgcl}/builder/ProgramGraphBuilder.h (96%) rename src/{storm => storm-pgcl}/parser/PgclParser.cpp (99%) rename src/{storm => storm-pgcl}/parser/PgclParser.h (94%) rename src/{storm => storm-pgcl}/storage/pgcl/AbstractStatementVisitor.h (100%) rename src/{storm => storm-pgcl}/storage/pgcl/AssignmentStatement.cpp (90%) rename src/{storm => storm-pgcl}/storage/pgcl/AssignmentStatement.h (95%) rename src/{storm => storm-pgcl}/storage/pgcl/Block.cpp (100%) rename src/{storm => storm-pgcl}/storage/pgcl/Block.h (98%) rename src/{storm => storm-pgcl}/storage/pgcl/BooleanExpression.cpp (89%) rename src/{storm => storm-pgcl}/storage/pgcl/BooleanExpression.h (100%) rename src/{storm => storm-pgcl}/storage/pgcl/BranchStatement.cpp (76%) rename src/{storm => storm-pgcl}/storage/pgcl/BranchStatement.h (92%) rename src/{storm => storm-pgcl}/storage/pgcl/CompoundStatement.h (92%) rename src/{storm => storm-pgcl}/storage/pgcl/IfStatement.cpp (95%) rename src/{storm => storm-pgcl}/storage/pgcl/IfStatement.h (94%) rename src/{storm => storm-pgcl}/storage/pgcl/LoopStatement.cpp (86%) rename src/{storm => storm-pgcl}/storage/pgcl/LoopStatement.h (82%) rename src/{storm => storm-pgcl}/storage/pgcl/NondeterministicBranch.cpp (82%) rename src/{storm => storm-pgcl}/storage/pgcl/NondeterministicBranch.h (79%) rename src/{storm => storm-pgcl}/storage/pgcl/ObserveStatement.cpp (80%) rename src/{storm => storm-pgcl}/storage/pgcl/ObserveStatement.h (92%) rename src/{storm => storm-pgcl}/storage/pgcl/PgclProgram.cpp (100%) rename src/{storm => storm-pgcl}/storage/pgcl/PgclProgram.h (96%) rename src/{storm => storm-pgcl}/storage/pgcl/ProbabilisticBranch.cpp (85%) rename src/{storm => storm-pgcl}/storage/pgcl/ProbabilisticBranch.h (97%) rename src/{storm => storm-pgcl}/storage/pgcl/Statement.cpp (89%) rename src/{storm => storm-pgcl}/storage/pgcl/Statement.h (98%) rename src/{storm => storm-pgcl}/storage/pgcl/StatementPrinterVisitor.cpp (92%) rename src/{storm => storm-pgcl}/storage/pgcl/StatementPrinterVisitor.h (94%) rename src/{storm => storm-pgcl}/storage/pgcl/UniformExpression.cpp (100%) rename src/{storm => storm-pgcl}/storage/pgcl/UniformExpression.h (100%) rename src/{storm => storm-pgcl}/storage/pgcl/VariableDeclaration.h (100%) rename src/{storm => storm-pgcl}/storage/ppg/ProgramAction.cpp (100%) rename src/{storm => storm-pgcl}/storage/ppg/ProgramAction.h (100%) rename src/{storm => storm-pgcl}/storage/ppg/ProgramEdge.cpp (100%) rename src/{storm => storm-pgcl}/storage/ppg/ProgramEdge.h (100%) rename src/{storm => storm-pgcl}/storage/ppg/ProgramEdgeGroup.cpp (100%) rename src/{storm => storm-pgcl}/storage/ppg/ProgramEdgeGroup.h (100%) rename src/{storm => storm-pgcl}/storage/ppg/ProgramGraph.cpp (100%) rename src/{storm => storm-pgcl}/storage/ppg/ProgramGraph.h (99%) rename src/{storm => storm-pgcl}/storage/ppg/ProgramLocation.cpp (100%) rename src/{storm => storm-pgcl}/storage/ppg/ProgramLocation.h (100%) rename src/{storm => storm-pgcl}/storage/ppg/defines.h (100%) delete mode 100755 src/storm/storage/pgcl/CompoundStatement.cpp delete mode 100755 src/storm/storage/pgcl/SimpleStatement.cpp delete mode 100755 src/storm/storage/pgcl/SimpleStatement.h delete mode 100644 src/storm/storage/pgcl/VariableDeclaration.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f40d63809..d40a958e0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1 +1,3 @@ add_subdirectory(storm) +add_subdirectory(storm-pgcl) +add_subdirectory(storm-pgcl-cli) diff --git a/src/storm-pgcl-cli/CMakeLists.txt b/src/storm-pgcl-cli/CMakeLists.txt new file mode 100644 index 000000000..7f8bc65fb --- /dev/null +++ b/src/storm-pgcl-cli/CMakeLists.txt @@ -0,0 +1,3 @@ +add_executable(storm-pgcl-cli ${PROJECT_SOURCE_DIR}/src/storm-pgcl-cli/storm-pgcl.cpp) +target_link_libraries(storm-pgcl-cli storm-pgcl) +set_target_properties(storm-main PROPERTIES OUTPUT_NAME "storm-pgcl") \ No newline at end of file diff --git a/src/storm/storm-pgcl.cpp b/src/storm-pgcl-cli/storm-pgcl.cpp similarity index 96% rename from src/storm/storm-pgcl.cpp rename to src/storm-pgcl-cli/storm-pgcl.cpp index 9416d56be..bf5dc1c1e 100644 --- a/src/storm/storm-pgcl.cpp +++ b/src/storm-pgcl-cli/storm-pgcl.cpp @@ -1,4 +1,4 @@ -#include "storm/parser/PgclParser.h" +#include "storm-pgcl/parser/PgclParser.h" #include "logic/Formula.h" #include "utility/initialize.h" @@ -7,8 +7,8 @@ #include "storm/exceptions/BaseException.h" #include "storm/utility/macros.h" #include -#include "storm/builder/ProgramGraphBuilder.h" -#include "storm/builder/JaniProgramGraphBuilder.h" +#include "storm-pgcl/builder/ProgramGraphBuilder.h" +#include "storm-pgcl/builder/JaniProgramGraphBuilder.h" #include "storm/storage/jani/JSONExporter.h" #include "storm/exceptions/FileIoException.h" diff --git a/src/storm-pgcl/CMakeLists.txt b/src/storm-pgcl/CMakeLists.txt new file mode 100644 index 000000000..c28480520 --- /dev/null +++ b/src/storm-pgcl/CMakeLists.txt @@ -0,0 +1,8 @@ + +file(GLOB_RECURSE STORM_PGCL_SOURCES ${PROJECT_SOURCE_DIR}/src/storm-pgcl/*/*.cpp) +file(GLOB_RECURSE STORM_PGCL_HEADERS ${PROJECT_SOURCE_DIR}/src/storm-pgcl/*/*.h) + + +# Create storm-pgcl. +add_library(storm-pgcl SHARED ${STORM_PGCL_SOURCES} ${STORM_PGCL_HEADERS}) +target_link_libraries(storm-pgcl storm) diff --git a/src/storm/builder/JaniProgramGraphBuilder.cpp b/src/storm-pgcl/builder/JaniProgramGraphBuilder.cpp similarity index 100% rename from src/storm/builder/JaniProgramGraphBuilder.cpp rename to src/storm-pgcl/builder/JaniProgramGraphBuilder.cpp diff --git a/src/storm/builder/JaniProgramGraphBuilder.h b/src/storm-pgcl/builder/JaniProgramGraphBuilder.h similarity index 99% rename from src/storm/builder/JaniProgramGraphBuilder.h rename to src/storm-pgcl/builder/JaniProgramGraphBuilder.h index e3c354550..34b5dd5d7 100644 --- a/src/storm/builder/JaniProgramGraphBuilder.h +++ b/src/storm-pgcl/builder/JaniProgramGraphBuilder.h @@ -1,15 +1,16 @@ #include #include -#include "storm/storage/ppg/ProgramGraph.h" #include "storm/storage/jani/Model.h" #include "storm/storage/jani/Location.h" #include "storm/storage/jani/EdgeDestination.h" #include "storm/storage/IntegerInterval.h" #include "storm/exceptions/NotSupportedException.h" - #include "storm/utility/macros.h" +#include "storm-pgcl/storage/ppg/ProgramGraph.h" + + namespace storm { namespace builder { diff --git a/src/storm/builder/ProgramGraphBuilder.cpp b/src/storm-pgcl/builder/ProgramGraphBuilder.cpp similarity index 92% rename from src/storm/builder/ProgramGraphBuilder.cpp rename to src/storm-pgcl/builder/ProgramGraphBuilder.cpp index 18f40318d..8a15d5de2 100644 --- a/src/storm/builder/ProgramGraphBuilder.cpp +++ b/src/storm-pgcl/builder/ProgramGraphBuilder.cpp @@ -1,10 +1,10 @@ #include "ProgramGraphBuilder.h" -#include "storm/storage/pgcl/AssignmentStatement.h" -#include "storm/storage/pgcl/ObserveStatement.h" -#include "storm/storage/pgcl/LoopStatement.h" -#include "storm/storage/pgcl/IfStatement.h" -#include "storm/storage/pgcl/NondeterministicBranch.h" -#include "storm/storage/pgcl/ProbabilisticBranch.h" +#include "storm-pgcl/storage/pgcl/AssignmentStatement.h" +#include "storm-pgcl/storage/pgcl/ObserveStatement.h" +#include "storm-pgcl/storage/pgcl/LoopStatement.h" +#include "storm-pgcl/storage/pgcl/IfStatement.h" +#include "storm-pgcl/storage/pgcl/NondeterministicBranch.h" +#include "storm-pgcl/storage/pgcl/ProbabilisticBranch.h" namespace storm { diff --git a/src/storm/builder/ProgramGraphBuilder.h b/src/storm-pgcl/builder/ProgramGraphBuilder.h similarity index 96% rename from src/storm/builder/ProgramGraphBuilder.h rename to src/storm-pgcl/builder/ProgramGraphBuilder.h index 38d8aab75..7fd343eb7 100644 --- a/src/storm/builder/ProgramGraphBuilder.h +++ b/src/storm-pgcl/builder/ProgramGraphBuilder.h @@ -1,9 +1,9 @@ #pragma once -#include "storm/storage/pgcl/PgclProgram.h" -#include "storm/storage/ppg/ProgramGraph.h" -#include "storm/storage/pgcl/AbstractStatementVisitor.h" -#include "storm/storage/pgcl/UniformExpression.h" +#include "storm-pgcl/storage/pgcl/PgclProgram.h" +#include "storm-pgcl/storage/ppg/ProgramGraph.h" +#include "storm-pgcl/storage/pgcl/AbstractStatementVisitor.h" +#include "storm-pgcl/storage/pgcl/UniformExpression.h" namespace storm { namespace builder { diff --git a/src/storm/parser/PgclParser.cpp b/src/storm-pgcl/parser/PgclParser.cpp similarity index 99% rename from src/storm/parser/PgclParser.cpp rename to src/storm-pgcl/parser/PgclParser.cpp index 9031376a4..ca264de5f 100755 --- a/src/storm/parser/PgclParser.cpp +++ b/src/storm-pgcl/parser/PgclParser.cpp @@ -1,4 +1,4 @@ -#include "storm/parser/PgclParser.h" +#include "PgclParser.h" // If the parser fails due to ill-formed data, this exception is thrown. #include "storm/exceptions/WrongFormatException.h" diff --git a/src/storm/parser/PgclParser.h b/src/storm-pgcl/parser/PgclParser.h similarity index 94% rename from src/storm/parser/PgclParser.h rename to src/storm-pgcl/parser/PgclParser.h index 5cf122363..dfd75a810 100755 --- a/src/storm/parser/PgclParser.h +++ b/src/storm-pgcl/parser/PgclParser.h @@ -10,16 +10,16 @@ #include "storm/parser/ExpressionParser.h" #include "storm/storage/expressions/ExpressionManager.h" #include "storm/storage/expressions/Expression.h" -#include "storm/storage/pgcl/PgclProgram.h" -#include "storm/storage/pgcl/AssignmentStatement.h" -#include "storm/storage/pgcl/BooleanExpression.h" -#include "storm/storage/pgcl/UniformExpression.h" -#include "storm/storage/pgcl/IfStatement.h" -#include "storm/storage/pgcl/LoopStatement.h" -#include "storm/storage/pgcl/NondeterministicBranch.h" -#include "storm/storage/pgcl/ObserveStatement.h" -#include "storm/storage/pgcl/ProbabilisticBranch.h" -#include "storm/storage/pgcl/Statement.h" +#include "storm-pgcl/storage/pgcl/PgclProgram.h" +#include "storm-pgcl/storage/pgcl/AssignmentStatement.h" +#include "storm-pgcl/storage/pgcl/BooleanExpression.h" +#include "storm-pgcl/storage/pgcl/UniformExpression.h" +#include "storm-pgcl/storage/pgcl/IfStatement.h" +#include "storm-pgcl/storage/pgcl/LoopStatement.h" +#include "storm-pgcl/storage/pgcl/NondeterministicBranch.h" +#include "storm-pgcl/storage/pgcl/ObserveStatement.h" +#include "storm-pgcl/storage/pgcl/ProbabilisticBranch.h" +#include "storm-pgcl/storage/pgcl/Statement.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/AbstractStatementVisitor.h b/src/storm-pgcl/storage/pgcl/AbstractStatementVisitor.h similarity index 100% rename from src/storm/storage/pgcl/AbstractStatementVisitor.h rename to src/storm-pgcl/storage/pgcl/AbstractStatementVisitor.h diff --git a/src/storm/storage/pgcl/AssignmentStatement.cpp b/src/storm-pgcl/storage/pgcl/AssignmentStatement.cpp similarity index 90% rename from src/storm/storage/pgcl/AssignmentStatement.cpp rename to src/storm-pgcl/storage/pgcl/AssignmentStatement.cpp index 009c1a465..71923c584 100755 --- a/src/storm/storage/pgcl/AssignmentStatement.cpp +++ b/src/storm-pgcl/storage/pgcl/AssignmentStatement.cpp @@ -1,4 +1,5 @@ -#include "storm/storage/pgcl/AssignmentStatement.h" +#include "AssignmentStatement.h" +#include "storm-pgcl/storage/pgcl/AbstractStatementVisitor.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/AssignmentStatement.h b/src/storm-pgcl/storage/pgcl/AssignmentStatement.h similarity index 95% rename from src/storm/storage/pgcl/AssignmentStatement.h rename to src/storm-pgcl/storage/pgcl/AssignmentStatement.h index 689ea697a..57fd84248 100755 --- a/src/storm/storage/pgcl/AssignmentStatement.h +++ b/src/storm-pgcl/storage/pgcl/AssignmentStatement.h @@ -1,7 +1,7 @@ #pragma once -#include "storm/storage/pgcl/SimpleStatement.h" -#include "storm/storage/pgcl/UniformExpression.h" +#include "storm-pgcl/storage/pgcl/Statement.h" +#include "storm-pgcl/storage/pgcl/UniformExpression.h" #include "storm/storage/expressions/Expression.h" #include "storm/storage/expressions/Variable.h" #include diff --git a/src/storm/storage/pgcl/Block.cpp b/src/storm-pgcl/storage/pgcl/Block.cpp similarity index 100% rename from src/storm/storage/pgcl/Block.cpp rename to src/storm-pgcl/storage/pgcl/Block.cpp diff --git a/src/storm/storage/pgcl/Block.h b/src/storm-pgcl/storage/pgcl/Block.h similarity index 98% rename from src/storm/storage/pgcl/Block.h rename to src/storm-pgcl/storage/pgcl/Block.h index 0d60e1bcf..8e88cc12c 100644 --- a/src/storm/storage/pgcl/Block.h +++ b/src/storm-pgcl/storage/pgcl/Block.h @@ -1,8 +1,8 @@ #pragma once #include -#include "storm/storage/pgcl/Statement.h" -#include "storm/storage/pgcl/StatementPrinterVisitor.h" +#include "Statement.h" +#include "StatementPrinterVisitor.h" #include "storm/storage/expressions/ExpressionManager.h" namespace storm { diff --git a/src/storm/storage/pgcl/BooleanExpression.cpp b/src/storm-pgcl/storage/pgcl/BooleanExpression.cpp similarity index 89% rename from src/storm/storage/pgcl/BooleanExpression.cpp rename to src/storm-pgcl/storage/pgcl/BooleanExpression.cpp index b4a5a246d..d71d91ef1 100755 --- a/src/storm/storage/pgcl/BooleanExpression.cpp +++ b/src/storm-pgcl/storage/pgcl/BooleanExpression.cpp @@ -1,4 +1,4 @@ -#include "storm/storage/pgcl/BooleanExpression.h" +#include "BooleanExpression.h" #include "storm/storage/expressions/ExpressionManager.h" namespace storm { diff --git a/src/storm/storage/pgcl/BooleanExpression.h b/src/storm-pgcl/storage/pgcl/BooleanExpression.h similarity index 100% rename from src/storm/storage/pgcl/BooleanExpression.h rename to src/storm-pgcl/storage/pgcl/BooleanExpression.h diff --git a/src/storm/storage/pgcl/BranchStatement.cpp b/src/storm-pgcl/storage/pgcl/BranchStatement.cpp similarity index 76% rename from src/storm/storage/pgcl/BranchStatement.cpp rename to src/storm-pgcl/storage/pgcl/BranchStatement.cpp index 6ac128385..bcd2a2a3b 100755 --- a/src/storm/storage/pgcl/BranchStatement.cpp +++ b/src/storm-pgcl/storage/pgcl/BranchStatement.cpp @@ -1,5 +1,5 @@ -#include "storm/storage/pgcl/BranchStatement.h" -#include "storm/storage/pgcl/AbstractStatementVisitor.h" +#include "BranchStatement.h" +#include "AbstractStatementVisitor.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/BranchStatement.h b/src/storm-pgcl/storage/pgcl/BranchStatement.h similarity index 92% rename from src/storm/storage/pgcl/BranchStatement.h rename to src/storm-pgcl/storage/pgcl/BranchStatement.h index bedc517d8..4127f8638 100755 --- a/src/storm/storage/pgcl/BranchStatement.h +++ b/src/storm-pgcl/storage/pgcl/BranchStatement.h @@ -1,7 +1,7 @@ #pragma once -#include "storm/storage/pgcl/PgclProgram.h" -#include "storm/storage/pgcl/CompoundStatement.h" +#include "storm-pgcl/storage/pgcl/PgclProgram.h" +#include "storm-pgcl/storage/pgcl/Statement.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/CompoundStatement.h b/src/storm-pgcl/storage/pgcl/CompoundStatement.h similarity index 92% rename from src/storm/storage/pgcl/CompoundStatement.h rename to src/storm-pgcl/storage/pgcl/CompoundStatement.h index 470c2cad5..960cac8a3 100755 --- a/src/storm/storage/pgcl/CompoundStatement.h +++ b/src/storm-pgcl/storage/pgcl/CompoundStatement.h @@ -1,6 +1,6 @@ #pragma once -#include "storm/storage/pgcl/Statement.h" +#include "storm-pgcl/storage/pgcl/Statement.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/IfStatement.cpp b/src/storm-pgcl/storage/pgcl/IfStatement.cpp similarity index 95% rename from src/storm/storage/pgcl/IfStatement.cpp rename to src/storm-pgcl/storage/pgcl/IfStatement.cpp index 198486598..dc31da297 100755 --- a/src/storm/storage/pgcl/IfStatement.cpp +++ b/src/storm-pgcl/storage/pgcl/IfStatement.cpp @@ -1,5 +1,5 @@ #include "IfStatement.h" -#include "storm/storage/pgcl/AbstractStatementVisitor.h" +#include "storm-pgcl/storage/pgcl/AbstractStatementVisitor.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/IfStatement.h b/src/storm-pgcl/storage/pgcl/IfStatement.h similarity index 94% rename from src/storm/storage/pgcl/IfStatement.h rename to src/storm-pgcl/storage/pgcl/IfStatement.h index c4498a809..cf84cb366 100755 --- a/src/storm/storage/pgcl/IfStatement.h +++ b/src/storm-pgcl/storage/pgcl/IfStatement.h @@ -1,8 +1,8 @@ #pragma once -#include "storm/storage/pgcl/CompoundStatement.h" -#include "storm/storage/pgcl/BooleanExpression.h" -#include "storm/storage/pgcl/PgclProgram.h" +#include "storm-pgcl/storage/pgcl/Statement.h" +#include "storm-pgcl/storage/pgcl/BooleanExpression.h" +#include "storm-pgcl/storage/pgcl/PgclProgram.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/LoopStatement.cpp b/src/storm-pgcl/storage/pgcl/LoopStatement.cpp similarity index 86% rename from src/storm/storage/pgcl/LoopStatement.cpp rename to src/storm-pgcl/storage/pgcl/LoopStatement.cpp index 7f0cfcb1e..49dcf3c04 100755 --- a/src/storm/storage/pgcl/LoopStatement.cpp +++ b/src/storm-pgcl/storage/pgcl/LoopStatement.cpp @@ -1,6 +1,6 @@ -#include "storm/storage/pgcl/LoopStatement.h" -#include "storm/storage/pgcl/AbstractStatementVisitor.h" +#include "LoopStatement.h" +#include "storm-pgcl/storage/pgcl/AbstractStatementVisitor.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/LoopStatement.h b/src/storm-pgcl/storage/pgcl/LoopStatement.h similarity index 82% rename from src/storm/storage/pgcl/LoopStatement.h rename to src/storm-pgcl/storage/pgcl/LoopStatement.h index 998d28187..46ffea1af 100755 --- a/src/storm/storage/pgcl/LoopStatement.h +++ b/src/storm-pgcl/storage/pgcl/LoopStatement.h @@ -1,16 +1,7 @@ -/* - * File: LoopStatement.h - * Author: Lukas Westhofen - * - * Created on 11. April 2015, 17:42 - */ +#pragma once -#ifndef LOOPSTATEMENT_H -#define LOOPSTATEMENT_H - -#include "storm/storage/pgcl/PgclProgram.h" -#include "storm/storage/pgcl/CompoundStatement.h" -#include "storm/storage/pgcl/BooleanExpression.h" +#include "storm-pgcl/storage/pgcl/PgclProgram.h" +#include "storm-pgcl/storage/pgcl/BooleanExpression.h" namespace storm { namespace pgcl { @@ -50,5 +41,3 @@ namespace storm { } } -#endif /* LOOPSTATEMENT_H */ - diff --git a/src/storm/storage/pgcl/NondeterministicBranch.cpp b/src/storm-pgcl/storage/pgcl/NondeterministicBranch.cpp similarity index 82% rename from src/storm/storage/pgcl/NondeterministicBranch.cpp rename to src/storm-pgcl/storage/pgcl/NondeterministicBranch.cpp index 88401ebe8..8eae22937 100755 --- a/src/storm/storage/pgcl/NondeterministicBranch.cpp +++ b/src/storm-pgcl/storage/pgcl/NondeterministicBranch.cpp @@ -1,5 +1,5 @@ -#include "storm/storage/pgcl/NondeterministicBranch.h" -#include "storm/storage/pgcl/AbstractStatementVisitor.h" +#include "NondeterministicBranch.h" +#include "storm-pgcl/storage/pgcl/AbstractStatementVisitor.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/NondeterministicBranch.h b/src/storm-pgcl/storage/pgcl/NondeterministicBranch.h similarity index 79% rename from src/storm/storage/pgcl/NondeterministicBranch.h rename to src/storm-pgcl/storage/pgcl/NondeterministicBranch.h index d8f41d32f..1df376953 100755 --- a/src/storm/storage/pgcl/NondeterministicBranch.h +++ b/src/storm-pgcl/storage/pgcl/NondeterministicBranch.h @@ -1,14 +1,6 @@ -/* - * File: NondeterministicBranch.h - * Author: Lukas Westhofen - * - * Created on 11. April 2015, 17:44 - */ +#pragma once -#ifndef NONDETERMINISTICBRANCH_H -#define NONDETERMINISTICBRANCH_H - -#include "storm/storage/pgcl/BranchStatement.h" +#include "storm-pgcl/storage/pgcl/BranchStatement.h" namespace storm { namespace pgcl { @@ -35,5 +27,3 @@ namespace storm { } } -#endif /* NONDETERMINISTICBRANCH_H */ - diff --git a/src/storm/storage/pgcl/ObserveStatement.cpp b/src/storm-pgcl/storage/pgcl/ObserveStatement.cpp similarity index 80% rename from src/storm/storage/pgcl/ObserveStatement.cpp rename to src/storm-pgcl/storage/pgcl/ObserveStatement.cpp index aa96b04f1..721df9b12 100755 --- a/src/storm/storage/pgcl/ObserveStatement.cpp +++ b/src/storm-pgcl/storage/pgcl/ObserveStatement.cpp @@ -1,5 +1,5 @@ -#include "storm/storage/pgcl/ObserveStatement.h" -#include "storm/storage/pgcl/AbstractStatementVisitor.h" +#include "ObserveStatement.h" +#include "storm-pgcl/storage/pgcl/AbstractStatementVisitor.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/ObserveStatement.h b/src/storm-pgcl/storage/pgcl/ObserveStatement.h similarity index 92% rename from src/storm/storage/pgcl/ObserveStatement.h rename to src/storm-pgcl/storage/pgcl/ObserveStatement.h index 895e6af26..824f3bc11 100755 --- a/src/storm/storage/pgcl/ObserveStatement.h +++ b/src/storm-pgcl/storage/pgcl/ObserveStatement.h @@ -1,7 +1,7 @@ #pragma once -#include "storm/storage/pgcl/SimpleStatement.h" -#include "storm/storage/pgcl/BooleanExpression.h" +#include "storm-pgcl/storage/pgcl/Statement.h" +#include "storm-pgcl/storage/pgcl/BooleanExpression.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/PgclProgram.cpp b/src/storm-pgcl/storage/pgcl/PgclProgram.cpp similarity index 100% rename from src/storm/storage/pgcl/PgclProgram.cpp rename to src/storm-pgcl/storage/pgcl/PgclProgram.cpp diff --git a/src/storm/storage/pgcl/PgclProgram.h b/src/storm-pgcl/storage/pgcl/PgclProgram.h similarity index 96% rename from src/storm/storage/pgcl/PgclProgram.h rename to src/storm-pgcl/storage/pgcl/PgclProgram.h index edf61d380..4103dfdbb 100755 --- a/src/storm/storage/pgcl/PgclProgram.h +++ b/src/storm-pgcl/storage/pgcl/PgclProgram.h @@ -3,8 +3,8 @@ #include #include "Block.h" #include "VariableDeclaration.h" -#include "storm/storage/pgcl/Statement.h" -#include "storm/storage/pgcl/StatementPrinterVisitor.h" +#include "storm-pgcl/storage/pgcl/Statement.h" +#include "storm-pgcl/storage/pgcl/StatementPrinterVisitor.h" #include "storm/storage/expressions/ExpressionManager.h" namespace storm { diff --git a/src/storm/storage/pgcl/ProbabilisticBranch.cpp b/src/storm-pgcl/storage/pgcl/ProbabilisticBranch.cpp similarity index 85% rename from src/storm/storage/pgcl/ProbabilisticBranch.cpp rename to src/storm-pgcl/storage/pgcl/ProbabilisticBranch.cpp index 1cde9e9e0..40a9a014e 100755 --- a/src/storm/storage/pgcl/ProbabilisticBranch.cpp +++ b/src/storm-pgcl/storage/pgcl/ProbabilisticBranch.cpp @@ -1,5 +1,5 @@ -#include "storm/storage/pgcl/ProbabilisticBranch.h" -#include "storm/storage/pgcl/AbstractStatementVisitor.h" +#include "ProbabilisticBranch.h" +#include "storm-pgcl/storage/pgcl/AbstractStatementVisitor.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/ProbabilisticBranch.h b/src/storm-pgcl/storage/pgcl/ProbabilisticBranch.h similarity index 97% rename from src/storm/storage/pgcl/ProbabilisticBranch.h rename to src/storm-pgcl/storage/pgcl/ProbabilisticBranch.h index 2597d9137..9180bec04 100755 --- a/src/storm/storage/pgcl/ProbabilisticBranch.h +++ b/src/storm-pgcl/storage/pgcl/ProbabilisticBranch.h @@ -1,6 +1,6 @@ #pragma once -#include "storm/storage/pgcl/BranchStatement.h" +#include "storm-pgcl/storage/pgcl/BranchStatement.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/Statement.cpp b/src/storm-pgcl/storage/pgcl/Statement.cpp similarity index 89% rename from src/storm/storage/pgcl/Statement.cpp rename to src/storm-pgcl/storage/pgcl/Statement.cpp index 103777bae..629de7978 100755 --- a/src/storm/storage/pgcl/Statement.cpp +++ b/src/storm-pgcl/storage/pgcl/Statement.cpp @@ -1,9 +1,9 @@ -#include "storm/storage/pgcl/Statement.h" -#include "Block.h" +#include "Statement.h" +#include "storm-pgcl/storage/pgcl/Block.h" namespace storm { namespace pgcl { - const bool Statement::operator==(const Statement& other) const { + bool Statement::operator==(const Statement& other) const { return (other.locationNumber == this->locationNumber); } diff --git a/src/storm/storage/pgcl/Statement.h b/src/storm-pgcl/storage/pgcl/Statement.h similarity index 98% rename from src/storm/storage/pgcl/Statement.h rename to src/storm-pgcl/storage/pgcl/Statement.h index 6a913a9bf..102a7fd2c 100755 --- a/src/storm/storage/pgcl/Statement.h +++ b/src/storm-pgcl/storage/pgcl/Statement.h @@ -25,7 +25,7 @@ namespace storm { * @param other The other statement to check equality of. * @return True iff the statements are equal. */ - const bool operator==(const Statement& other) const; + bool operator==(const Statement& other) const; /** * Returns the line number inside the string where the PGCL program * was parsed from. diff --git a/src/storm/storage/pgcl/StatementPrinterVisitor.cpp b/src/storm-pgcl/storage/pgcl/StatementPrinterVisitor.cpp similarity index 92% rename from src/storm/storage/pgcl/StatementPrinterVisitor.cpp rename to src/storm-pgcl/storage/pgcl/StatementPrinterVisitor.cpp index f35262719..4fba5b505 100755 --- a/src/storm/storage/pgcl/StatementPrinterVisitor.cpp +++ b/src/storm-pgcl/storage/pgcl/StatementPrinterVisitor.cpp @@ -1,11 +1,11 @@ -#include "storm/storage/pgcl/StatementPrinterVisitor.h" +#include "StatementPrinterVisitor.h" -#include "storm/storage/pgcl/AssignmentStatement.h" -#include "storm/storage/pgcl/ObserveStatement.h" -#include "storm/storage/pgcl/IfStatement.h" -#include "storm/storage/pgcl/LoopStatement.h" -#include "storm/storage/pgcl/NondeterministicBranch.h" -#include "storm/storage/pgcl/ProbabilisticBranch.h" +#include "storm-pgcl/storage/pgcl/AssignmentStatement.h" +#include "storm-pgcl/storage/pgcl/ObserveStatement.h" +#include "storm-pgcl/storage/pgcl/IfStatement.h" +#include "storm-pgcl/storage/pgcl/LoopStatement.h" +#include "storm-pgcl/storage/pgcl/NondeterministicBranch.h" +#include "storm-pgcl/storage/pgcl/ProbabilisticBranch.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/StatementPrinterVisitor.h b/src/storm-pgcl/storage/pgcl/StatementPrinterVisitor.h similarity index 94% rename from src/storm/storage/pgcl/StatementPrinterVisitor.h rename to src/storm-pgcl/storage/pgcl/StatementPrinterVisitor.h index 23b9d9c73..f1e6ebdf0 100755 --- a/src/storm/storage/pgcl/StatementPrinterVisitor.h +++ b/src/storm-pgcl/storage/pgcl/StatementPrinterVisitor.h @@ -2,7 +2,7 @@ #include #include -#include "storm/storage/pgcl/AbstractStatementVisitor.h" +#include "storm-pgcl/storage/pgcl/AbstractStatementVisitor.h" namespace storm { namespace pgcl { diff --git a/src/storm/storage/pgcl/UniformExpression.cpp b/src/storm-pgcl/storage/pgcl/UniformExpression.cpp similarity index 100% rename from src/storm/storage/pgcl/UniformExpression.cpp rename to src/storm-pgcl/storage/pgcl/UniformExpression.cpp diff --git a/src/storm/storage/pgcl/UniformExpression.h b/src/storm-pgcl/storage/pgcl/UniformExpression.h similarity index 100% rename from src/storm/storage/pgcl/UniformExpression.h rename to src/storm-pgcl/storage/pgcl/UniformExpression.h diff --git a/src/storm/storage/pgcl/VariableDeclaration.h b/src/storm-pgcl/storage/pgcl/VariableDeclaration.h similarity index 100% rename from src/storm/storage/pgcl/VariableDeclaration.h rename to src/storm-pgcl/storage/pgcl/VariableDeclaration.h diff --git a/src/storm/storage/ppg/ProgramAction.cpp b/src/storm-pgcl/storage/ppg/ProgramAction.cpp similarity index 100% rename from src/storm/storage/ppg/ProgramAction.cpp rename to src/storm-pgcl/storage/ppg/ProgramAction.cpp diff --git a/src/storm/storage/ppg/ProgramAction.h b/src/storm-pgcl/storage/ppg/ProgramAction.h similarity index 100% rename from src/storm/storage/ppg/ProgramAction.h rename to src/storm-pgcl/storage/ppg/ProgramAction.h diff --git a/src/storm/storage/ppg/ProgramEdge.cpp b/src/storm-pgcl/storage/ppg/ProgramEdge.cpp similarity index 100% rename from src/storm/storage/ppg/ProgramEdge.cpp rename to src/storm-pgcl/storage/ppg/ProgramEdge.cpp diff --git a/src/storm/storage/ppg/ProgramEdge.h b/src/storm-pgcl/storage/ppg/ProgramEdge.h similarity index 100% rename from src/storm/storage/ppg/ProgramEdge.h rename to src/storm-pgcl/storage/ppg/ProgramEdge.h diff --git a/src/storm/storage/ppg/ProgramEdgeGroup.cpp b/src/storm-pgcl/storage/ppg/ProgramEdgeGroup.cpp similarity index 100% rename from src/storm/storage/ppg/ProgramEdgeGroup.cpp rename to src/storm-pgcl/storage/ppg/ProgramEdgeGroup.cpp diff --git a/src/storm/storage/ppg/ProgramEdgeGroup.h b/src/storm-pgcl/storage/ppg/ProgramEdgeGroup.h similarity index 100% rename from src/storm/storage/ppg/ProgramEdgeGroup.h rename to src/storm-pgcl/storage/ppg/ProgramEdgeGroup.h diff --git a/src/storm/storage/ppg/ProgramGraph.cpp b/src/storm-pgcl/storage/ppg/ProgramGraph.cpp similarity index 100% rename from src/storm/storage/ppg/ProgramGraph.cpp rename to src/storm-pgcl/storage/ppg/ProgramGraph.cpp diff --git a/src/storm/storage/ppg/ProgramGraph.h b/src/storm-pgcl/storage/ppg/ProgramGraph.h similarity index 99% rename from src/storm/storage/ppg/ProgramGraph.h rename to src/storm-pgcl/storage/ppg/ProgramGraph.h index bc89e26ce..68d34e209 100644 --- a/src/storm/storage/ppg/ProgramGraph.h +++ b/src/storm-pgcl/storage/ppg/ProgramGraph.h @@ -10,7 +10,7 @@ #include "ProgramEdgeGroup.h" #include "ProgramAction.h" -#include "storm/storage/pgcl/VariableDeclaration.h" +#include "storm-pgcl/storage/pgcl/VariableDeclaration.h" namespace storm { namespace ppg { diff --git a/src/storm/storage/ppg/ProgramLocation.cpp b/src/storm-pgcl/storage/ppg/ProgramLocation.cpp similarity index 100% rename from src/storm/storage/ppg/ProgramLocation.cpp rename to src/storm-pgcl/storage/ppg/ProgramLocation.cpp diff --git a/src/storm/storage/ppg/ProgramLocation.h b/src/storm-pgcl/storage/ppg/ProgramLocation.h similarity index 100% rename from src/storm/storage/ppg/ProgramLocation.h rename to src/storm-pgcl/storage/ppg/ProgramLocation.h diff --git a/src/storm/storage/ppg/defines.h b/src/storm-pgcl/storage/ppg/defines.h similarity index 100% rename from src/storm/storage/ppg/defines.h rename to src/storm-pgcl/storage/ppg/defines.h diff --git a/src/storm/CMakeLists.txt b/src/storm/CMakeLists.txt index d96955b65..722cdedde 100644 --- a/src/storm/CMakeLists.txt +++ b/src/storm/CMakeLists.txt @@ -4,26 +4,19 @@ ## ############################################################# file(GLOB_RECURSE STORM_HEADERS ${PROJECT_SOURCE_DIR}/src/storm/*.h) -file(GLOB_RECURSE STORM_HEADERS_CLI ${PROJECT_SOURCE_DIR}/src/storm/cli/*.h) file(GLOB_RECURSE STORM_SOURCES_WITHOUT_MAIN ${PROJECT_SOURCE_DIR}/src/storm/*/*.cpp) -file(GLOB_RECURSE STORM_SOURCES_CLI ${PROJECT_SOURCE_DIR}/src/storm/cli/*.cpp) file(GLOB_RECURSE STORM_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm/storm.cpp) file(GLOB_RECURSE STORM_DFT_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm/storm-dyftee.cpp) -file(GLOB_RECURSE STORM_PGCL_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm/storm-pgcl.cpp) file(GLOB_RECURSE STORM_GSPN_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm/storm-gspn.cpp) # Additional include files like the storm-config.h file(GLOB_RECURSE STORM_BUILD_HEADERS ${PROJECT_BINARY_DIR}/include/*.h) set(STORM_LIB_SOURCES ${STORM_SOURCES_WITHOUT_MAIN}) -list(REMOVE_ITEM STORM_LIB_SOURCES ${STORM_SOURCES_CLI}) set(STORM_LIB_HEADERS ${STORM_HEADERS}) -list(REMOVE_ITEM STORM_LIB_HEADERS ${STORM_HEADERS_CLI}) -set(STORM_MAIN_SOURCES ${STORM_SOURCES_CLI} ${STORM_MAIN_FILE}) -set(STORM_DFT_MAIN_SOURCES ${STORM_SOURCES_CLI} ${STORM_DFT_MAIN_FILE}) -set(STORM_PGCL_MAIN_SOURCES ${STORM_SOURCES_CLI} ${STORM_PGCL_MAIN_FILE}) -set(STORM_GSPN_MAIN_SOURCES ${STORM_SOURCES_CLI} ${STORM_GSPN_MAIN_FILE}) -set(STORM_MAIN_HEADERS ${STORM_HEADERS_CLI}) +set(STORM_MAIN_SOURCES ${STORM_MAIN_FILE}) +set(STORM_DFT_MAIN_SOURCES ${STORM_DFT_MAIN_FILE}) +set(STORM_GSPN_MAIN_SOURCES ${STORM_GSPN_MAIN_FILE}) file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/storm/*.h ${PROJECT_SOURCE_DIR}/src/storm/*.cpp) @@ -62,11 +55,6 @@ add_executable(storm-dft-main ${STORM_DFT_MAIN_SOURCES} ${STORM_MAIN_HEADERS}) target_link_libraries(storm-dft-main storm) # Adding headers for xcode set_target_properties(storm-dft-main PROPERTIES OUTPUT_NAME "storm-dft") -# Create storm-pgcl. -add_executable(storm-pgcl-main ${STORM_PGCL_MAIN_SOURCES} ${STORM_MAIN_HEADERS}) -target_link_libraries(storm-pgcl-main storm) -set_target_properties(storm-pgcl-main PROPERTIES OUTPUT_NAME "storm-pgcl") - add_executable(storm-gspn-main ${STORM_GSPN_MAIN_SOURCES} ${STORM_MAIN_HEADERS}) target_link_libraries(storm-gspn-main storm) # Adding headers for xcode set_target_properties(storm-gspn-main PROPERTIES OUTPUT_NAME "storm-gspn") diff --git a/src/storm/storage/pgcl/CompoundStatement.cpp b/src/storm/storage/pgcl/CompoundStatement.cpp deleted file mode 100755 index c6fd8a75a..000000000 --- a/src/storm/storage/pgcl/CompoundStatement.cpp +++ /dev/null @@ -1,15 +0,0 @@ -/* - * File: CompoundStatement.cpp - * Author: Lukas Westhofen - * - * Created on 11. April 2015, 17:41 - */ - -#include "storm/storage/pgcl/CompoundStatement.h" - -namespace storm { - namespace pgcl { - - } -} - diff --git a/src/storm/storage/pgcl/SimpleStatement.cpp b/src/storm/storage/pgcl/SimpleStatement.cpp deleted file mode 100755 index a92ad7f82..000000000 --- a/src/storm/storage/pgcl/SimpleStatement.cpp +++ /dev/null @@ -1,15 +0,0 @@ -/* - * File: SimpleStatement.cpp - * Author: Lukas Westhofen - * - * Created on 11. April 2015, 17:41 - */ - -#include "storm/storage/pgcl/SimpleStatement.h" - -namespace storm { - namespace pgcl { - - } -} - diff --git a/src/storm/storage/pgcl/SimpleStatement.h b/src/storm/storage/pgcl/SimpleStatement.h deleted file mode 100755 index 1e2cc1fee..000000000 --- a/src/storm/storage/pgcl/SimpleStatement.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * File: SimpleStatement.h - * Author: Lukas Westhofen - * - * Created on 11. April 2015, 17:41 - */ - -#ifndef SIMPLESTATEMENT_H -#define SIMPLESTATEMENT_H - -#include "storm/storage/pgcl/Statement.h" -#include "storm/storage/pgcl/AbstractStatementVisitor.h" - -namespace storm { - namespace pgcl { - /* - * Simple statements are statements not containing other PGCL programs. - * Exactly one variable can be part of that statement. - */ - class SimpleStatement : public Statement { - public: - SimpleStatement() = default; - SimpleStatement(const SimpleStatement& orig) = default; - virtual ~SimpleStatement() = default; - virtual void accept(class AbstractStatementVisitor& visitor) = 0; - }; - } -} -#endif /* SIMPLESTATEMENT_H */ - diff --git a/src/storm/storage/pgcl/VariableDeclaration.cpp b/src/storm/storage/pgcl/VariableDeclaration.cpp deleted file mode 100644 index 241437821..000000000 --- a/src/storm/storage/pgcl/VariableDeclaration.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "VariableDeclaration.h"