Browse Source

first fixes after merge

Former-commit-id: f19347885d
tempestpy_adaptions
sjunges 9 years ago
parent
commit
437e883bcf
  1. 5
      src/solver/MinMaxLinearEquationSolver.h
  2. 1
      src/solver/NativeLinearEquationSolver.h

5
src/solver/MinMaxLinearEquationSolver.h

@ -47,7 +47,7 @@ namespace storm {
* solver, but may be ignored.
* @param b The vector to add after matrix-vector multiplication.
*/
virtual void solveEquations(OptimizationDirection d, std::vector<ValueType>& x, std::vector<ValueType> const& b) const = 0;
virtual bool solveEquations(OptimizationDirection d, std::vector<ValueType>& x, std::vector<ValueType> const& b) const = 0;
/*!
* Behaves the same as the other variant of <code>solveEquations</code>, with the distinction that
@ -145,8 +145,7 @@ namespace storm {
* @return True iff auxiliary storage was previously allocated (and not yet deallocated).
*/
virtual bool hasAuxMemory(MinMaxLinearEquationSolverOperation operation) const;
storm::storage::SparseMatrix<ValueType> const& getMatrix() const { return A; }
protected:
/// The optimization direction to use for calls to functions that do not provide it explicitly. Can also be unset.

1
src/solver/NativeLinearEquationSolver.h

@ -60,6 +60,7 @@ namespace storm {
virtual bool reallocateAuxMemory(LinearEquationSolverOperation operation) const override;
virtual bool hasAuxMemory(LinearEquationSolverOperation operation) const override;
storm::storage::SparseMatrix<ValueType> const& getMatrix() const { return *A; }
private:
virtual uint64_t getMatrixRowCount() const override;
virtual uint64_t getMatrixColumnCount() const override;

Loading…
Cancel
Save