From 2fcb12e8752c5348e1042e5099e0a86341da13a7 Mon Sep 17 00:00:00 2001 From: dehnert Date: Fri, 28 Mar 2014 11:18:15 +0100 Subject: [PATCH] Fixed some backslashes in includes to slashes and changed indentation of some code. Former-commit-id: 0e4828e3685debe90a095d9a6f82298988f7fc87 --- src/storage/dd/CuddDd.h | 24 ++++++++++++------------ src/storage/dd/CuddDdManager.h | 16 +++++++--------- src/storage/dd/DdMetaVariable.h | 18 ++++++++---------- 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/src/storage/dd/CuddDd.h b/src/storage/dd/CuddDd.h index 74a1a6c7f..414190b2e 100644 --- a/src/storage/dd/CuddDd.h +++ b/src/storage/dd/CuddDd.h @@ -6,7 +6,7 @@ #include #include "src/storage/dd/Dd.h" -#include "utility\OsDetection.h" +#include "src/utility/OsDetection.h" // Include the C++-interface of CUDD. #include "cuddObj.hh" @@ -26,10 +26,10 @@ namespace storm { Dd() = default; Dd(Dd const& other) = default; Dd& operator=(Dd const& other) = default; - #ifndef WINDOWS - Dd(Dd&& other) = default; - Dd& operator=(Dd&& other) = default; - #endif +#ifndef WINDOWS + Dd(Dd&& other) = default; + Dd& operator=(Dd&& other) = default; +#endif /*! * Retrieves whether the two DDs represent the same function. @@ -45,7 +45,7 @@ namespace storm { * @return The result of the addition. */ Dd operator+(Dd const& other) const; - + /*! * Adds the given DD to the current one. * @@ -61,7 +61,7 @@ namespace storm { * @return The result of the multiplication. */ Dd operator*(Dd const& other) const; - + /*! * Multiplies the given DD with the current one and assigns the result to the current DD. * @@ -183,7 +183,7 @@ namespace storm { * @param metaVariableNames The names of all meta variables from which to abstract. */ void existsAbstract(std::set const& metaVariableNames); - + /*! * Sum-abstracts from the given meta variables. * @@ -204,7 +204,7 @@ namespace storm { * @param metaVariableNames The names of all meta variables from which to abstract. */ void maxAbstract(std::set const& metaVariableNames); - + /*! * Swaps the given pairs of meta variables in the DD. The pairs of meta variables must be guaranteed to have * the same number of underlying DD variables. @@ -269,7 +269,7 @@ namespace storm { * @param targetValue The new function value of the modified encodings. */ void setValue(std::string const& metaVariableName, int_fast64_t variableValue, double targetValue); - + /*! * Sets the function values of all encodings that have the given values of the two meta variables to the * given target value. @@ -382,7 +382,7 @@ namespace storm { * @param metaVariableName The name of the meta variable to remove. */ void removeContainedMetaVariable(std::string const& metaVariableName); - + /*! * Creates a DD that encapsulates the given CUDD ADD. * @@ -394,7 +394,7 @@ namespace storm { // A pointer to the manager responsible for this DD. std::shared_ptr> ddManager; - + // The ADD created by CUDD. ADD cuddAdd; diff --git a/src/storage/dd/CuddDdManager.h b/src/storage/dd/CuddDdManager.h index 25feb01cf..666376719 100644 --- a/src/storage/dd/CuddDdManager.h +++ b/src/storage/dd/CuddDdManager.h @@ -6,7 +6,7 @@ #include "src/storage/dd/DdManager.h" #include "src/storage/dd/DdMetaVariable.h" #include "src/storage/dd/CuddDd.h" -#include "utility\OsDetection.h" +#include "src/utility/OsDetection.h" // Include the C++-interface of CUDD. #include "cuddObj.hh" @@ -18,7 +18,7 @@ namespace storm { public: // To break the cylic dependencies, we need to forward-declare the other DD-related classes. friend class Dd; - + /*! * Creates an empty manager without any meta variables. */ @@ -27,12 +27,10 @@ namespace storm { // Explictly forbid copying a DdManager, but allow moving it. DdManager(DdManager const& other) = delete; DdManager& operator=(DdManager const& other) = delete; - #ifndef WINDOWS - DdManager(DdManager&& other) = default; - DdManager& operator=(DdManager&& other) = default; - #endif - - +#ifndef WINDOWS + DdManager(DdManager&& other) = default; + DdManager& operator=(DdManager&& other) = default; +#endif /*! * Retrieves a DD representing the constant one function. @@ -54,7 +52,7 @@ namespace storm { * @return A DD representing the constant function with the given value. */ Dd getConstant(double value); - + /*! * Retrieves the DD representing the function that maps all inputs which have the given meta variable equal * to the given value one. diff --git a/src/storage/dd/DdMetaVariable.h b/src/storage/dd/DdMetaVariable.h index 2212cf265..994b0841a 100644 --- a/src/storage/dd/DdMetaVariable.h +++ b/src/storage/dd/DdMetaVariable.h @@ -6,7 +6,7 @@ #include #include -#include "utility\OsDetection.h" +#include "utility/OsDetection.h" #include "src/storage/dd/CuddDd.h" namespace storm { @@ -35,12 +35,10 @@ namespace storm { // Explictly generate all default versions of copy/move constructors/assignments. DdMetaVariable(DdMetaVariable const& other) = default; DdMetaVariable& operator=(DdMetaVariable const& other) = default; - #ifndef WINDOWS - DdMetaVariable(DdMetaVariable&& other) = default; - DdMetaVariable& operator=(DdMetaVariable&& other) = default; - #endif - - +#ifndef WINDOWS + DdMetaVariable(DdMetaVariable&& other) = default; + DdMetaVariable& operator=(DdMetaVariable&& other) = default; +#endif /*! * Retrieves the name of the meta variable. @@ -55,14 +53,14 @@ namespace storm { * @return The lowest value of the range of the variable. */ int_fast64_t getLow() const; - + /*! * Retrieves the highest value of the range of the variable. * * @return The highest value of the range of the variable. */ int_fast64_t getHigh() const; - + /*! * Retrieves the manager that is responsible for this meta variable. * @@ -91,7 +89,7 @@ namespace storm { * @return The cube of all variables that encode this meta variable. */ Dd const& getCube() const; - + // The name of the meta variable. std::string name;