Browse Source

moved storm-pgcl to a seperate lib; also slightly cleaned the code

tempestpy_adaptions
sjunges 8 years ago
parent
commit
960447b2c3
  1. 2
      src/CMakeLists.txt
  2. 3
      src/storm-pgcl-cli/CMakeLists.txt
  3. 6
      src/storm-pgcl-cli/storm-pgcl.cpp
  4. 8
      src/storm-pgcl/CMakeLists.txt
  5. 0
      src/storm-pgcl/builder/JaniProgramGraphBuilder.cpp
  6. 5
      src/storm-pgcl/builder/JaniProgramGraphBuilder.h
  7. 12
      src/storm-pgcl/builder/ProgramGraphBuilder.cpp
  8. 8
      src/storm-pgcl/builder/ProgramGraphBuilder.h
  9. 2
      src/storm-pgcl/parser/PgclParser.cpp
  10. 20
      src/storm-pgcl/parser/PgclParser.h
  11. 0
      src/storm-pgcl/storage/pgcl/AbstractStatementVisitor.h
  12. 3
      src/storm-pgcl/storage/pgcl/AssignmentStatement.cpp
  13. 4
      src/storm-pgcl/storage/pgcl/AssignmentStatement.h
  14. 0
      src/storm-pgcl/storage/pgcl/Block.cpp
  15. 4
      src/storm-pgcl/storage/pgcl/Block.h
  16. 2
      src/storm-pgcl/storage/pgcl/BooleanExpression.cpp
  17. 0
      src/storm-pgcl/storage/pgcl/BooleanExpression.h
  18. 4
      src/storm-pgcl/storage/pgcl/BranchStatement.cpp
  19. 4
      src/storm-pgcl/storage/pgcl/BranchStatement.h
  20. 2
      src/storm-pgcl/storage/pgcl/CompoundStatement.h
  21. 2
      src/storm-pgcl/storage/pgcl/IfStatement.cpp
  22. 6
      src/storm-pgcl/storage/pgcl/IfStatement.h
  23. 4
      src/storm-pgcl/storage/pgcl/LoopStatement.cpp
  24. 17
      src/storm-pgcl/storage/pgcl/LoopStatement.h
  25. 4
      src/storm-pgcl/storage/pgcl/NondeterministicBranch.cpp
  26. 14
      src/storm-pgcl/storage/pgcl/NondeterministicBranch.h
  27. 4
      src/storm-pgcl/storage/pgcl/ObserveStatement.cpp
  28. 4
      src/storm-pgcl/storage/pgcl/ObserveStatement.h
  29. 0
      src/storm-pgcl/storage/pgcl/PgclProgram.cpp
  30. 4
      src/storm-pgcl/storage/pgcl/PgclProgram.h
  31. 4
      src/storm-pgcl/storage/pgcl/ProbabilisticBranch.cpp
  32. 2
      src/storm-pgcl/storage/pgcl/ProbabilisticBranch.h
  33. 6
      src/storm-pgcl/storage/pgcl/Statement.cpp
  34. 2
      src/storm-pgcl/storage/pgcl/Statement.h
  35. 14
      src/storm-pgcl/storage/pgcl/StatementPrinterVisitor.cpp
  36. 2
      src/storm-pgcl/storage/pgcl/StatementPrinterVisitor.h
  37. 0
      src/storm-pgcl/storage/pgcl/UniformExpression.cpp
  38. 0
      src/storm-pgcl/storage/pgcl/UniformExpression.h
  39. 0
      src/storm-pgcl/storage/pgcl/VariableDeclaration.h
  40. 0
      src/storm-pgcl/storage/ppg/ProgramAction.cpp
  41. 0
      src/storm-pgcl/storage/ppg/ProgramAction.h
  42. 0
      src/storm-pgcl/storage/ppg/ProgramEdge.cpp
  43. 0
      src/storm-pgcl/storage/ppg/ProgramEdge.h
  44. 0
      src/storm-pgcl/storage/ppg/ProgramEdgeGroup.cpp
  45. 0
      src/storm-pgcl/storage/ppg/ProgramEdgeGroup.h
  46. 0
      src/storm-pgcl/storage/ppg/ProgramGraph.cpp
  47. 2
      src/storm-pgcl/storage/ppg/ProgramGraph.h
  48. 0
      src/storm-pgcl/storage/ppg/ProgramLocation.cpp
  49. 0
      src/storm-pgcl/storage/ppg/ProgramLocation.h
  50. 0
      src/storm-pgcl/storage/ppg/defines.h
  51. 18
      src/storm/CMakeLists.txt
  52. 15
      src/storm/storage/pgcl/CompoundStatement.cpp
  53. 15
      src/storm/storage/pgcl/SimpleStatement.cpp
  54. 30
      src/storm/storage/pgcl/SimpleStatement.h
  55. 1
      src/storm/storage/pgcl/VariableDeclaration.cpp

2
src/CMakeLists.txt

@ -1 +1,3 @@
add_subdirectory(storm)
add_subdirectory(storm-pgcl)
add_subdirectory(storm-pgcl-cli)

3
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")

6
src/storm/storm-pgcl.cpp → 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 <boost/lexical_cast.hpp>
#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"

8
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)

0
src/storm/builder/JaniProgramGraphBuilder.cpp → src/storm-pgcl/builder/JaniProgramGraphBuilder.cpp

5
src/storm/builder/JaniProgramGraphBuilder.h → src/storm-pgcl/builder/JaniProgramGraphBuilder.h

@ -1,15 +1,16 @@
#include <string>
#include <unordered_map>
#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 {

12
src/storm/builder/ProgramGraphBuilder.cpp → 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 {

8
src/storm/builder/ProgramGraphBuilder.h → 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 {

2
src/storm/parser/PgclParser.cpp → 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"

20
src/storm/parser/PgclParser.h → 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 {

0
src/storm/storage/pgcl/AbstractStatementVisitor.h → src/storm-pgcl/storage/pgcl/AbstractStatementVisitor.h

3
src/storm/storage/pgcl/AssignmentStatement.cpp → 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 {

4
src/storm/storage/pgcl/AssignmentStatement.h → 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 <boost/variant/variant.hpp>

0
src/storm/storage/pgcl/Block.cpp → src/storm-pgcl/storage/pgcl/Block.cpp

4
src/storm/storage/pgcl/Block.h → src/storm-pgcl/storage/pgcl/Block.h

@ -1,8 +1,8 @@
#pragma once
#include <vector>
#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 {

2
src/storm/storage/pgcl/BooleanExpression.cpp → 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 {

0
src/storm/storage/pgcl/BooleanExpression.h → src/storm-pgcl/storage/pgcl/BooleanExpression.h

4
src/storm/storage/pgcl/BranchStatement.cpp → 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 {

4
src/storm/storage/pgcl/BranchStatement.h → 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 {

2
src/storm/storage/pgcl/CompoundStatement.h → 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 {

2
src/storm/storage/pgcl/IfStatement.cpp → 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 {

6
src/storm/storage/pgcl/IfStatement.h → 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 {

4
src/storm/storage/pgcl/LoopStatement.cpp → 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 {

17
src/storm/storage/pgcl/LoopStatement.h → 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 */

4
src/storm/storage/pgcl/NondeterministicBranch.cpp → 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 {

14
src/storm/storage/pgcl/NondeterministicBranch.h → 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 */

4
src/storm/storage/pgcl/ObserveStatement.cpp → 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 {

4
src/storm/storage/pgcl/ObserveStatement.h → 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 {

0
src/storm/storage/pgcl/PgclProgram.cpp → src/storm-pgcl/storage/pgcl/PgclProgram.cpp

4
src/storm/storage/pgcl/PgclProgram.h → src/storm-pgcl/storage/pgcl/PgclProgram.h

@ -3,8 +3,8 @@
#include <vector>
#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 {

4
src/storm/storage/pgcl/ProbabilisticBranch.cpp → 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 {

2
src/storm/storage/pgcl/ProbabilisticBranch.h → 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 {

6
src/storm/storage/pgcl/Statement.cpp → 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);
}

2
src/storm/storage/pgcl/Statement.h → 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.

14
src/storm/storage/pgcl/StatementPrinterVisitor.cpp → 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 {

2
src/storm/storage/pgcl/StatementPrinterVisitor.h → src/storm-pgcl/storage/pgcl/StatementPrinterVisitor.h

@ -2,7 +2,7 @@
#include <iostream>
#include <boost/variant/get.hpp>
#include "storm/storage/pgcl/AbstractStatementVisitor.h"
#include "storm-pgcl/storage/pgcl/AbstractStatementVisitor.h"
namespace storm {
namespace pgcl {

0
src/storm/storage/pgcl/UniformExpression.cpp → src/storm-pgcl/storage/pgcl/UniformExpression.cpp

0
src/storm/storage/pgcl/UniformExpression.h → src/storm-pgcl/storage/pgcl/UniformExpression.h

0
src/storm/storage/pgcl/VariableDeclaration.h → src/storm-pgcl/storage/pgcl/VariableDeclaration.h

0
src/storm/storage/ppg/ProgramAction.cpp → src/storm-pgcl/storage/ppg/ProgramAction.cpp

0
src/storm/storage/ppg/ProgramAction.h → src/storm-pgcl/storage/ppg/ProgramAction.h

0
src/storm/storage/ppg/ProgramEdge.cpp → src/storm-pgcl/storage/ppg/ProgramEdge.cpp

0
src/storm/storage/ppg/ProgramEdge.h → src/storm-pgcl/storage/ppg/ProgramEdge.h

0
src/storm/storage/ppg/ProgramEdgeGroup.cpp → src/storm-pgcl/storage/ppg/ProgramEdgeGroup.cpp

0
src/storm/storage/ppg/ProgramEdgeGroup.h → src/storm-pgcl/storage/ppg/ProgramEdgeGroup.h

0
src/storm/storage/ppg/ProgramGraph.cpp → src/storm-pgcl/storage/ppg/ProgramGraph.cpp

2
src/storm/storage/ppg/ProgramGraph.h → 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 {

0
src/storm/storage/ppg/ProgramLocation.cpp → src/storm-pgcl/storage/ppg/ProgramLocation.cpp

0
src/storm/storage/ppg/ProgramLocation.h → src/storm-pgcl/storage/ppg/ProgramLocation.h

0
src/storm/storage/ppg/defines.h → src/storm-pgcl/storage/ppg/defines.h

18
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")

15
src/storm/storage/pgcl/CompoundStatement.cpp

@ -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 {
}
}

15
src/storm/storage/pgcl/SimpleStatement.cpp

@ -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 {
}
}

30
src/storm/storage/pgcl/SimpleStatement.h

@ -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 */

1
src/storm/storage/pgcl/VariableDeclaration.cpp

@ -1 +0,0 @@
#include "VariableDeclaration.h"
Loading…
Cancel
Save