Browse Source

missing expression operations for divide and modulo added

refactoring
Sebastian Junges 4 years ago
parent
commit
039ae24cb6
  1. 2
      src/storage/expressions.cpp

2
src/storage/expressions.cpp

@ -105,6 +105,7 @@ void define_expressions(py::module& m) {
.def_static("Plus", [](Expression const& lhs, Expression const& rhs) {return lhs + rhs;}) .def_static("Plus", [](Expression const& lhs, Expression const& rhs) {return lhs + rhs;})
.def_static("Minus", [](Expression const& lhs, Expression const& rhs) {return lhs - rhs;}) .def_static("Minus", [](Expression const& lhs, Expression const& rhs) {return lhs - rhs;})
.def_static("Multiply", [](Expression const& lhs, Expression const& rhs) {return lhs * rhs;}) .def_static("Multiply", [](Expression const& lhs, Expression const& rhs) {return lhs * rhs;})
.def_static("Divide", [](Expression const& lhs, Expression const& rhs) {return lhs / rhs;})
.def_static("And", [](Expression const& lhs, Expression const& rhs) {return lhs && rhs;}) .def_static("And", [](Expression const& lhs, Expression const& rhs) {return lhs && rhs;})
.def_static("Or", [](Expression const& lhs, Expression const& rhs) {return lhs || rhs;}) .def_static("Or", [](Expression const& lhs, Expression const& rhs) {return lhs || rhs;})
.def_static("Geq", [](Expression const& lhs, Expression const& rhs) {return lhs >= rhs;}) .def_static("Geq", [](Expression const& lhs, Expression const& rhs) {return lhs >= rhs;})
@ -113,6 +114,7 @@ void define_expressions(py::module& m) {
.def_static("Greater", [](Expression const& lhs, Expression const& rhs) {return lhs > rhs;}) .def_static("Greater", [](Expression const& lhs, Expression const& rhs) {return lhs > rhs;})
.def_static("Less", [](Expression const& lhs, Expression const& rhs) {return lhs < rhs;}) .def_static("Less", [](Expression const& lhs, Expression const& rhs) {return lhs < rhs;})
.def_static("Leq", [](Expression const& lhs, Expression const& rhs) {return lhs <= rhs;}) .def_static("Leq", [](Expression const& lhs, Expression const& rhs) {return lhs <= rhs;})
.def_static("Modulo", [](Expression const& lhs, Expression const& rhs) {return storm::expressions::modulo(lhs, rhs);})
.def_static("Implies", [](Expression const& lhs, Expression const& rhs) {return storm::expressions::implies(lhs, rhs);}) .def_static("Implies", [](Expression const& lhs, Expression const& rhs) {return storm::expressions::implies(lhs, rhs);})
.def_static("Iff", [](Expression const& lhs, Expression const& rhs) {return storm::expressions::iff(lhs, rhs);}) .def_static("Iff", [](Expression const& lhs, Expression const& rhs) {return storm::expressions::iff(lhs, rhs);})
.def_static("Conjunction", [](std::vector<Expression> const& expr) {return storm::expressions::conjunction(expr); }) .def_static("Conjunction", [](std::vector<Expression> const& expr) {return storm::expressions::conjunction(expr); })

Loading…
Cancel
Save