Browse Source

Fixed some backslashes in includes to slashes and changed indentation of some code.

Former-commit-id: 0e4828e368
tempestpy_adaptions
dehnert 11 years ago
parent
commit
2fcb12e875
  1. 24
      src/storage/dd/CuddDd.h
  2. 16
      src/storage/dd/CuddDdManager.h
  3. 18
      src/storage/dd/DdMetaVariable.h

24
src/storage/dd/CuddDd.h

@ -6,7 +6,7 @@
#include <memory>
#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<CUDD> const& other) = default;
Dd& operator=(Dd<CUDD> const& other) = default;
#ifndef WINDOWS
Dd(Dd<CUDD>&& other) = default;
Dd& operator=(Dd<CUDD>&& other) = default;
#endif
#ifndef WINDOWS
Dd(Dd<CUDD>&& other) = default;
Dd& operator=(Dd<CUDD>&& 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<CUDD> operator+(Dd<CUDD> const& other) const;
/*!
* Adds the given DD to the current one.
*
@ -61,7 +61,7 @@ namespace storm {
* @return The result of the multiplication.
*/
Dd<CUDD> operator*(Dd<CUDD> 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<std::string> 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<std::string> 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<CUDD>> ddManager;
// The ADD created by CUDD.
ADD cuddAdd;

16
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<CUDD>;
/*!
* 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<CUDD> const& other) = delete;
DdManager<CUDD>& operator=(DdManager<CUDD> const& other) = delete;
#ifndef WINDOWS
DdManager(DdManager<CUDD>&& other) = default;
DdManager<CUDD>& operator=(DdManager<CUDD>&& other) = default;
#endif
#ifndef WINDOWS
DdManager(DdManager<CUDD>&& other) = default;
DdManager<CUDD>& operator=(DdManager<CUDD>&& 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<CUDD> 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.

18
src/storage/dd/DdMetaVariable.h

@ -6,7 +6,7 @@
#include <cstdint>
#include <string>
#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<Type> const& getCube() const;
// The name of the meta variable.
std::string name;

Loading…
Cancel
Save