From 0f9f5e67f6de888540618a6b18b86cb8995f53eb Mon Sep 17 00:00:00 2001 From: dehnert Date: Sun, 24 Feb 2013 15:10:47 +0100 Subject: [PATCH] A few minor fixes. Removed test for reward model. --- src/models/Mdp.h | 4 +++- ...NondeterministicSparseTransitionParser.cpp | 8 +++++-- test/reward/RewardModelTest.cpp | 23 ------------------- 3 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 test/reward/RewardModelTest.cpp diff --git a/src/models/Mdp.h b/src/models/Mdp.h index 515a1842e..586de6e5e 100644 --- a/src/models/Mdp.h +++ b/src/models/Mdp.h @@ -89,7 +89,9 @@ private: for (uint_fast64_t row = 0; row < this->getTransitionMatrix()->getRowCount(); row++) { T sum = this->getTransitionMatrix()->getRowSum(row); if (sum == 0) continue; - if (std::abs(sum - 1) > precision) return false; + if (std::abs(sum - 1) > precision) { + return false; + } } return true; } diff --git a/src/parser/NondeterministicSparseTransitionParser.cpp b/src/parser/NondeterministicSparseTransitionParser.cpp index 1cd08604b..fd9bf3d4f 100644 --- a/src/parser/NondeterministicSparseTransitionParser.cpp +++ b/src/parser/NondeterministicSparseTransitionParser.cpp @@ -136,7 +136,9 @@ uint_fast64_t NondeterministicSparseTransitionParser::firstPass(char* buf, uint_ // is followed by a space. We need to skip over that space first (instead of trimming whitespaces), // before we can skip to the line end, because trimming the white spaces will proceed to the next line // in case there is no action label in the fourth column. - ++buf; + if (buf[0] == ' ') { + ++buf; + } /* * Proceed to beginning of next line. @@ -285,7 +287,9 @@ NondeterministicSparseTransitionParser::NondeterministicSparseTransitionParser(s /* * Proceed to beginning of next line in file and next row in matrix. */ - ++buf; + if (buf[0] == ' ') { + ++buf; + } buf += strcspn(buf, " \t\n\r"); buf = trimWhitespaces(buf); } diff --git a/test/reward/RewardModelTest.cpp b/test/reward/RewardModelTest.cpp deleted file mode 100644 index 830830ac3..000000000 --- a/test/reward/RewardModelTest.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "gtest/gtest.h" - -#include "Eigen/Sparse" -#include "src/exceptions/InvalidArgumentException.h" -#include "boost/integer/integer_mask.hpp" -#include - -#include "reward/RewardModel.h" - -TEST(RewardModelTest, ReadWriteTest) { - // 50 entries - storm::reward::RewardModel rm(50, 0.0); - - double values[50]; - for (int i = 0; i < 50; ++i) { - values[i] = 1.0 + i; - ASSERT_TRUE(rm.setReward(i, values[i])); - - ASSERT_EQ(rm.getReward(i), values[i]); - } - -} -