Merge branch 'master' into LtlParser

Conflicts:
	CMakeLists.txt
	src/modelchecker/EigenDtmcPrctlModelChecker.h
	src/modelchecker/GmmxxMdpPrctlModelChecker.h
	src/modelchecker/SparseDtmcPrctlModelChecker.h
	src/modelchecker/SparseMdpPrctlModelChecker.h
	src/modelchecker/TopologicalValueIterationMdpPrctlModelChecker.h
	src/parser/LtlParser.cpp
	src/parser/PrctlParser.cpp
	test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp
	test/functional/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp
	test/functional/modelchecker/SparseMdpPrctlModelCheckerTest.cpp
	test/functional/storm-functional-tests.cpp
	test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp
	test/performance/modelchecker/GmmxxMdpPrctModelCheckerTest.cpp
	test/performance/modelchecker/SparseMdpPrctlModelCheckerTest.cpp
	test/performance/storm-performance-tests.cpp

CMakeLists.txt

@@ -245,6 +245,7 @@ if (CUDD_LIBRARY_DIRS)
     link_directories(${CUDD_LIBRARY_DIRS})
 endif(CUDD_LIBRARY_DIRS)
 
+<<<<<<< HEAD
 if (LTL2DSTAR_INCLUDE_DIRS)
     include_directories(${LTL2DSTAR_INCLUDE_DIRS})
 endif(LTL2DSTAR_INCLUDE_DIRS)
@@ -252,6 +253,8 @@ if (LTL2DSTAR_LIBRARY_DIRS)
     link_directories(${LTL2DSTAR_LIBRARY_DIRS})
 endif(LTL2DSTAR_LIBRARY_DIRS)
 
+=======
+>>>>>>> refs/heads/master
 # Add the executables
 # Must be created *after* Boost was added because of LINK_DIRECTORIES
 add_executable(storm ${STORM_SOURCES} ${STORM_HEADERS})
@@ -364,6 +367,7 @@ if (CUDD_LIBRARY_DIRS)
 		target_link_libraries(storm-performance-tests "-lobj -lcudd -lmtr -lst -lutil -lepd")
 	endif ()
 endif(CUDD_LIBRARY_DIRS)
+<<<<<<< HEAD
 
 if (LTL2DSTAR_LIBRARY_DIRS)
   if (MSVC)
@@ -374,6 +378,8 @@ if (LTL2DSTAR_LIBRARY_DIRS)
       target_link_libraries(storm-performance-tests "-lltl2dstar")
   endif ()
 endif (LTL2DSTAR_LIBRARY_DIRS)
+=======
+>>>>>>> refs/heads/master
 
 if (THREADS_FOUND)
 	include_directories(${THREADS_INCLUDE_DIRS})

src/modelchecker/prctl/GmmxxMdpPrctlModelChecker.h

@@ -154,7 +154,7 @@ private:
 		if (converged) {
 			LOG4CPLUS_INFO(logger, "Iterative solver converged after " << iterations << " iterations.");
 		} else {
-			LOG4CPLUS_WARN(logger, "Iterative solver did not converge.");
+			LOG4CPLUS_WARN(logger, "Iterative solver did not converge after " << iterations << " iterations.");
 		}
 	}
 };

test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp

@@ -123,4 +123,4 @@ TEST(GmmxxDtmcPrctlModelCheckerTest, SynchronousLeader) {
 
 	delete rewardFormula;
 	delete result;
-}
+}

test/performance/modelchecker/GmmxxMdpPrctModelCheckerTest.cpp

@@ -243,4 +243,4 @@ TEST(GmmxxMdpPrctlModelCheckerTest, Consensus) {
 	delete rewardFormula;
 	delete result;
 
-}
+}

test/performance/modelchecker/SparseMdpPrctlModelCheckerTest.cpp

@@ -241,4 +241,4 @@ TEST(SparseMdpPrctlModelCheckerTest, Consensus) {
 	delete rewardFormula;
 	delete result;
 
-}
+}