From a619303a1a960c5b1d77e050c6578e30c30fce40 Mon Sep 17 00:00:00 2001
From: dehnert <dehnert@cs.rwth-aachen.de>
Date: Thu, 30 May 2013 15:23:43 +0200
Subject: [PATCH] Removed unnecessary command line utilities.
---
src/modelchecker/AbstractModelChecker.h | 6 ++----
src/models/AbstractModel.h | 1 -
src/utility/CommandLine.cpp | 18 ------------------
src/utility/CommandLine.h | 24 ------------------------
src/utility/vector.h | 4 ++--
5 files changed, 4 insertions(+), 49 deletions(-)
delete mode 100644 src/utility/CommandLine.cpp
delete mode 100644 src/utility/CommandLine.h
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 <memory>
#include <vector>
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 <ostream>
-
-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<T> const& source, std::vector<T>& target, std::vec
*/
template<class T>
void reduceVectorMin(std::vector<T> const& source, std::vector<T>& target, std::vector<uint_fast64_t> const& rowGrouping) {
- reduceVector<T>(source, target, rowGrouping, [] (T const& val1, T const& val2) -> bool { return val1 < val2; });
+ reduceVector<T>(source, target, rowGrouping, std::less<T>());
}
/*!
@@ -197,7 +197,7 @@ void reduceVectorMin(std::vector<T> const& source, std::vector<T>& target, std::
*/
template<class T>
void reduceVectorMax(std::vector<T> const& source, std::vector<T>& target, std::vector<uint_fast64_t> const& rowGrouping) {
- reduceVector<T>(source, target, rowGrouping, [] (T const& val1, T const& val2) -> bool { return val1 > val2; });
+ reduceVector<T>(source, target, rowGrouping, std::greater<T>());
}
/*!