Commit 40427838 authored by lh1887's avatar lh1887
Browse files

Merge branch 'add-constrained-types' into 'feature/new_tnnmg'

Add 'ConstrainedMatrix' and 'ConstrainedBitVector' to linearizations

See merge request !6
parents 1afd983b 2b8554aa
Pipeline #7488 passed with stage
in 3 minutes and 31 seconds
......@@ -76,7 +76,9 @@ public:
using Matrix = typename F::Matrix;
using Vector = typename F::Vector;
using BitVector = BV;
using ConstrainedMatrix = Matrix;
using ConstrainedVector = Vector;
using ConstrainedBitVector = BitVector;
BoxConstrainedQuadraticFunctionalConstrainedLinearization(const F& f, const BitVector& ignore) :
......
......@@ -25,7 +25,9 @@ public:
using Matrix = typename F::Matrix;
using Vector = typename F::Vector;
using BitVector = BV;
using ConstrainedMatrix = Matrix;
using ConstrainedVector = Vector;
using ConstrainedBitVector = BitVector;
QuadraticFunctionalConstrainedLinearization(const F& f, const BitVector& ignore) :
......
......@@ -37,7 +37,7 @@ public:
using ConstrainedVector = typename Linearization::ConstrainedVector;
using ConstrainedMatrix = typename Linearization::ConstrainedMatrix;
using BitVector = typename Base::BitVector;
using ConstrainedBitVector = typename Linearization::ConstrainedBitvector;
using ConstrainedBitVector = typename Linearization::ConstrainedBitVector;
using Functional = F;
using IterativeSolver = Solvers::IterativeSolver< ConstrainedVector, Solvers::DefaultBitVector_t<ConstrainedVector> >;
using LinearSolver = Solvers::LinearSolver< ConstrainedMatrix, ConstrainedVector >;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment