From b305a3b498e01672f2f7bfbcc80b4fd4c9082f7e Mon Sep 17 00:00:00 2001 From: dehnert Date: Wed, 3 Dec 2014 14:19:46 +0100 Subject: [PATCH] Switched to FactorizedPolynomial as the basis for rational functions and added missing reward construct for one NAND model. Former-commit-id: 8bb62ee1d20c86ea8580734b657e0ad8e8963128 --- examples/pdtmc/nand/nand_10-5.pm | 5 +++++ src/storage/parameters.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/examples/pdtmc/nand/nand_10-5.pm b/examples/pdtmc/nand/nand_10-5.pm index 5a1006a73..2eddb28e9 100644 --- a/examples/pdtmc/nand/nand_10-5.pm +++ b/examples/pdtmc/nand/nand_10-5.pm @@ -69,3 +69,8 @@ endmodule label "target" = s=4 & z/N<0.1; label "end" = s=4; +// rewards: final value of gate +rewards + // [] s=0 & (c=N) & (u=M) : z/N; + s=0 & (c=N) & (u=M) : z/N; +endrewards diff --git a/src/storage/parameters.h b/src/storage/parameters.h index 5313a0e23..9dc862203 100644 --- a/src/storage/parameters.h +++ b/src/storage/parameters.h @@ -13,9 +13,9 @@ namespace storm // typedef carl::MultivariatePolynomial Polynomial; typedef carl::Variable Variable; typedef carl::MultivariatePolynomial RawPolynomial; -// typedef carl::FactorizedPolynomial Polynomial; + typedef carl::FactorizedPolynomial Polynomial; - typedef RawPolynomial Polynomial; +// typedef RawPolynomial Polynomial; typedef carl::CompareRelation CompareRelation; typedef carl::RationalFunction RationalFunction;