diff --git a/src/modelchecker/AbstractModelChecker.h b/src/modelchecker/AbstractModelChecker.h index 2de2bfb28..edd9d632b 100644 --- a/src/modelchecker/AbstractModelChecker.h +++ b/src/modelchecker/AbstractModelChecker.h @@ -157,8 +157,7 @@ public: delete result; } } - std::cout << std::endl; - storm::utility::printSeparationLine(std::cout); + std::cout << std::endl << "-------------------------------------------" << std::endl; } /*! @@ -187,8 +186,7 @@ public: delete result; } } - std::cout << std::endl; - storm::utility::printSeparationLine(std::cout); + std::cout << std::endl << "-------------------------------------------" << std::endl; } /*! diff --git a/src/models/AbstractModel.h b/src/models/AbstractModel.h index c4896a6c6..d4fb10fcd 100644 --- a/src/models/AbstractModel.h +++ b/src/models/AbstractModel.h @@ -4,7 +4,6 @@ #include "src/models/AtomicPropositionsLabeling.h" #include "src/storage/BitVector.h" #include "src/storage/SparseMatrix.h" -#include "src/utility/CommandLine.h" #include #include diff --git a/src/utility/CommandLine.cpp b/src/utility/CommandLine.cpp deleted file mode 100644 index f8f8321b4..000000000 --- a/src/utility/CommandLine.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - * CommandLine.cpp - * - * Created on: 26.12.2012 - * Author: Christian Dehnert - */ - -#include - -namespace storm { -namespace utility { - -void printSeparationLine(std::ostream& out) { - out << "------------------------------------------------------" << std::endl; -} - -} // namespace utility -} // namespace storm diff --git a/src/utility/CommandLine.h b/src/utility/CommandLine.h deleted file mode 100644 index 134706ec2..000000000 --- a/src/utility/CommandLine.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * CommandLine.h - * - * Created on: 26.12.2012 - * Author: Christian Dehnert - */ - -#ifndef STORM_UTILITY_COMMANDLINE_H_ -#define STORM_UTILITY_COMMANDLINE_H_ - -namespace storm { - -namespace utility { - -/*! - * Prints a separating line to the standard output. - */ -void printSeparationLine(std::ostream& out); - -} //namespace utility - -} //namespace storm - -#endif /* STORM_UTILITY_COMMANDLINE_H_ */ diff --git a/src/utility/vector.h b/src/utility/vector.h index 314084ef7..fff25fd52 100644 --- a/src/utility/vector.h +++ b/src/utility/vector.h @@ -185,7 +185,7 @@ void reduceVector(std::vector const& source, std::vector& target, std::vec */ template void reduceVectorMin(std::vector const& source, std::vector& target, std::vector const& rowGrouping) { - reduceVector(source, target, rowGrouping, [] (T const& val1, T const& val2) -> bool { return val1 < val2; }); + reduceVector(source, target, rowGrouping, std::less()); } /*! @@ -197,7 +197,7 @@ void reduceVectorMin(std::vector const& source, std::vector& target, std:: */ template void reduceVectorMax(std::vector const& source, std::vector& target, std::vector const& rowGrouping) { - reduceVector(source, target, rowGrouping, [] (T const& val1, T const& val2) -> bool { return val1 > val2; }); + reduceVector(source, target, rowGrouping, std::greater()); } /*!