From bcd67c63f743383253a6a76253f4cd15a9c0d50e Mon Sep 17 00:00:00 2001
From: Lukas Posch <lukas.posch@student.tugraz.at>
Date: Tue, 9 Mar 2021 17:41:19 +0100
Subject: [PATCH] removed "...Reachability" from GameViHelper and
 BoundedGloballyGameViHelper

---
 .../rpatl/helper/internal/BoundedGloballyGameViHelper.cpp   | 6 +++---
 .../rpatl/helper/internal/BoundedGloballyGameViHelper.h     | 2 +-
 .../modelchecker/rpatl/helper/internal/GameViHelper.cpp     | 6 +++---
 src/storm/modelchecker/rpatl/helper/internal/GameViHelper.h | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/storm/modelchecker/rpatl/helper/internal/BoundedGloballyGameViHelper.cpp b/src/storm/modelchecker/rpatl/helper/internal/BoundedGloballyGameViHelper.cpp
index f4bfbabb2..f40387fc0 100644
--- a/src/storm/modelchecker/rpatl/helper/internal/BoundedGloballyGameViHelper.cpp
+++ b/src/storm/modelchecker/rpatl/helper/internal/BoundedGloballyGameViHelper.cpp
@@ -17,7 +17,7 @@ namespace storm {
                 }
 
                 template <typename ValueType>
-                void BoundedGloballyGameViHelper<ValueType>::prepareSolversAndMultipliersReachability(const Environment& env) {
+                void BoundedGloballyGameViHelper<ValueType>::prepareSolversAndMultipliers(const Environment& env) {
                     _multiplier = storm::solver::MultiplierFactory<ValueType>().create(env, _transitionMatrix);
 /*
                     _x1IsCurrent = false;
@@ -26,7 +26,7 @@ namespace storm {
 
                 template <typename ValueType>
                 void BoundedGloballyGameViHelper<ValueType>::performValueIteration(Environment const& env, std::vector<ValueType>& x, std::vector<ValueType> b, storm::solver::OptimizationDirection const dir, uint64_t upperBound) {
-                    prepareSolversAndMultipliersReachability(env);
+                    prepareSolversAndMultipliers(env);
                     _b = b;
 /*
                     _x1.assign(_transitionMatrix.getRowGroupCount(), storm::utility::zero<ValueType>());
@@ -70,7 +70,7 @@ namespace storm {
                 template <typename ValueType>
                 void BoundedGloballyGameViHelper<ValueType>::performIterationStep(Environment const& env, storm::solver::OptimizationDirection const dir, std::vector<uint64_t>* choices) {
                     if (!_multiplier) {
-                        prepareSolversAndMultipliersReachability(env);
+                        prepareSolversAndMultipliers(env);
                     }
 /*                    _x1IsCurrent = !_x1IsCurrent;*/
 
diff --git a/src/storm/modelchecker/rpatl/helper/internal/BoundedGloballyGameViHelper.h b/src/storm/modelchecker/rpatl/helper/internal/BoundedGloballyGameViHelper.h
index 1553d369f..62a709f15 100644
--- a/src/storm/modelchecker/rpatl/helper/internal/BoundedGloballyGameViHelper.h
+++ b/src/storm/modelchecker/rpatl/helper/internal/BoundedGloballyGameViHelper.h
@@ -21,7 +21,7 @@ namespace storm {
                 public:
                     BoundedGloballyGameViHelper(storm::storage::SparseMatrix<ValueType> const& transitionMatrix, storm::storage::BitVector statesOfCoalition);
 
-                    void prepareSolversAndMultipliersReachability(const Environment& env);
+                    void prepareSolversAndMultipliers(const Environment& env);
 
                     void performValueIteration(Environment const& env, std::vector<ValueType>& x, std::vector<ValueType> b, storm::solver::OptimizationDirection const dir, uint64_t upperBound);
 
diff --git a/src/storm/modelchecker/rpatl/helper/internal/GameViHelper.cpp b/src/storm/modelchecker/rpatl/helper/internal/GameViHelper.cpp
index 8c354d945..e0fd4eee8 100644
--- a/src/storm/modelchecker/rpatl/helper/internal/GameViHelper.cpp
+++ b/src/storm/modelchecker/rpatl/helper/internal/GameViHelper.cpp
@@ -20,7 +20,7 @@ namespace storm {
                 }
 
                 template <typename ValueType>
-                void GameViHelper<ValueType>::prepareSolversAndMultipliersReachability(const Environment& env) {
+                void GameViHelper<ValueType>::prepareSolversAndMultipliers(const Environment& env) {
                     // TODO we get whole transitionmatrix and psistates DONE IN smgrpatlhelper
                     // -> clip statesofcoalition
                     // -> compute b vector from psiStates
@@ -32,7 +32,7 @@ namespace storm {
 
                 template <typename ValueType>
                 void GameViHelper<ValueType>::performValueIteration(Environment const& env, std::vector<ValueType>& x, std::vector<ValueType> b, storm::solver::OptimizationDirection const dir) {
-                    prepareSolversAndMultipliersReachability(env);
+                    prepareSolversAndMultipliers(env);
                     ValueType precision = storm::utility::convertNumber<ValueType>(env.solver().game().getPrecision());
                     uint64_t maxIter = env.solver().game().getMaximalNumberOfIterations();
                     _b = b;
@@ -71,7 +71,7 @@ namespace storm {
                 template <typename ValueType>
                 void GameViHelper<ValueType>::performIterationStep(Environment const& env, storm::solver::OptimizationDirection const dir, std::vector<uint64_t>* choices) {
                     if (!_multiplier) {
-                        prepareSolversAndMultipliersReachability(env);
+                        prepareSolversAndMultipliers(env);
                     }
                     _x1IsCurrent = !_x1IsCurrent;
 
diff --git a/src/storm/modelchecker/rpatl/helper/internal/GameViHelper.h b/src/storm/modelchecker/rpatl/helper/internal/GameViHelper.h
index d46f9049c..9e0ed3285 100644
--- a/src/storm/modelchecker/rpatl/helper/internal/GameViHelper.h
+++ b/src/storm/modelchecker/rpatl/helper/internal/GameViHelper.h
@@ -21,7 +21,7 @@ namespace storm {
                 public:
                     GameViHelper(storm::storage::SparseMatrix<ValueType> const& transitionMatrix, storm::storage::BitVector statesOfCoalition);
 
-                    void prepareSolversAndMultipliersReachability(const Environment& env);
+                    void prepareSolversAndMultipliers(const Environment& env);
 
                     void performValueIteration(Environment const& env, std::vector<ValueType>& x, std::vector<ValueType> b, storm::solver::OptimizationDirection const dir);