From 65147aec12f988e36777f5c8e841389c068f6a95 Mon Sep 17 00:00:00 2001 From: Sebastian Junges Date: Thu, 29 Nov 2018 12:54:35 +0100 Subject: [PATCH] expressions: operators changed to capital (breaks backward compatibility) --- src/storage/expressions.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/storage/expressions.cpp b/src/storage/expressions.cpp index 4acdbfb..5345cae 100644 --- a/src/storage/expressions.cpp +++ b/src/storage/expressions.cpp @@ -52,19 +52,19 @@ void define_expressions(py::module& m) { .def("substitute", [](Expression const& expr, std::map const& map) { return expr.substitute(map);}, "substitution_map"_a) .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_(m, "ExpressionParser", "Parser for storm-expressions")