Commit 41aa3e3e authored by Mike Kremer's avatar Mike Kremer

The brackets weren't the problem. Control sequence \x does not exist in latex. Fixed this.

git-svn-id: http://www.openflipper.org/svnrepo/CoMISo/trunk@75 1355f012-dd97-4b2f-ae87-10fa9f823a57
parent 03657c98
......@@ -79,7 +79,7 @@ public:
/// Quadratic matrix constrained solver
/**
* Takes a system of the form Ax=b, a constraint matrix C and a set of variables _to_round to be rounded to integers. \f$ A\in \mathbf{R}^{n\times n}\f$
* @param _constraints row matrix with rows of the form \f$ \[c_1, c_2, \cdots, c_n, c_{n+1}\] \f$ corresponding to the linear equation \f$ c_1*x_1+\cdots+c_n*x_n + c_{n+1}=0 \f$.
* @param _constraints row matrix with rows of the form \f$ [ c_1, c_2, \cdots, c_n, c_{n+1} ] \f$ corresponding to the linear equation \f$ c_1*x_1+\cdots+c_n*x_n + c_{n+1}=0 \f$.
* @param _A nxn-dimensional column matrix of the system
* @param _x n-dimensional variable vector
* @param _rhs n-dimensional right hand side.
......@@ -114,9 +114,10 @@ public:
/// Non-Quadratic matrix constrained solver
/**
* Same as above, but performs the elimination of the constraints directly on the B matrix of \f$ x^\top B^\top Bx \f$, where B has m rows (equations) and (n+1) columns \f$ [x_1, x_2, \dots, \x_n, -rhs] \f$. \note This function might be more efficient in some cases, but generally the solver for the quadratic matrix above is a safer bet. Needs further testing.
* Same as above, but performs the elimination of the constraints directly on the B matrix of \f$ x^\top B^\top Bx \f$, where B has m rows (equations) and (n+1) columns \f$ [ x_1, x_2, \cdots, x_n, -rhs ] \f$.
* \note This function might be more efficient in some cases, but generally the solver for the quadratic matrix above is a safer bet. Needs further testing.
* \note Internally the \f$ A=B^\top B \f$ matrix is formed.
* @param _constraints row matrix with rows of the form \f$ [c_1, c_2, \cdots, c_n, c_{n+1}] \f$ corresponding to the linear equation \f$ c_1*x_1+\cdots+c_n*x_n + c_{n+1}=0 \f$.
* @param _constraints row matrix with rows of the form \f$ [ c_1, c_2, \cdots, c_n, c_{n+1} ] \f$ corresponding to the linear equation \f$ c_1*x_1+\cdots+c_n*x_n + c_{n+1}=0 \f$.
* @param _B mx(n+1)-dimensional column matrix of the system
* @param _x n-dimensional variable vector
* @param _idx_to_round indices i of variables x_i that shall be rounded
......
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