Browse Source

expressions: operators changed to capital (breaks backward compatibility)

refactoring
Sebastian Junges 6 years ago
parent
commit
65147aec12
  1. 26
      src/storage/expressions.cpp

26
src/storage/expressions.cpp

@ -52,19 +52,19 @@ void define_expressions(py::module& m) {
.def("substitute", [](Expression const& expr, std::map<Variable, Expression> const& map) { return expr.substitute(map);}, "substitution_map"_a) .def("substitute", [](Expression const& expr, std::map<Variable, Expression> const& map) { return expr.substitute(map);}, "substitution_map"_a)
.def("__str__", &storm::expressions::Expression::toString, "To string") .def("__str__", &storm::expressions::Expression::toString, "To string")
.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("multiply", [](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("geq", [](Expression const& lhs, Expression const& rhs) {return lhs >= rhs;})
.def_static("eq", [](Expression const& lhs, Expression const& rhs) {return lhs == rhs;})
.def_static("neq", [](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("leq", [](Expression const& lhs, Expression const& rhs) {return 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("Plus", [](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("And", [](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("Eq", [](Expression const& lhs, Expression const& rhs) {return lhs == rhs;})
.def_static("Neq", [](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("Leq", [](Expression const& lhs, Expression const& rhs) {return 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);})
; ;
py::class_<storm::parser::ExpressionParser>(m, "ExpressionParser", "Parser for storm-expressions") py::class_<storm::parser::ExpressionParser>(m, "ExpressionParser", "Parser for storm-expressions")

Loading…
Cancel
Save