Mercurial > hg > octave-jordi
diff src/npsol.cc @ 132:0869dc33276c
[project @ 1993-09-28 21:06:42 by jwe]
(linear_constraints_ok): Improve warning for the case of constraints
with zero dimensions.
(nonlinear_constraints_ok): Likewise.
| author | jwe |
|---|---|
| date | Tue, 28 Sep 1993 21:06:42 +0000 |
| parents | d68036bcad4c |
| children | 7aea883afd29 |
line wrap: on
line diff
--- a/src/npsol.cc +++ b/src/npsol.cc @@ -171,10 +171,23 @@ int lub_len = lub.capacity (); int c_rows = c.rows (); int c_cols = c.columns (); - int ok = x_len == c_cols && llb_len == lub_len && llb_len == c_rows; - if (! ok && warn) - message (warn_for, "linear constraints have inconsistent dimensions"); + int ok = 1; + if (warn) + { + if (c_rows == 0 || c_cols == 0 || llb_len == 0 || lub_len == 0) + { + ok = 0; + message (warn_for, + "linear constraints must have nonzero dimensions"); + } + else if (x_len != c_cols || llb_len != lub_len || llb_len != c_rows) + { + ok = 0; + message (warn_for, + "linear constraints have inconsistent dimensions"); + } + } return ok; } @@ -188,10 +201,23 @@ int nlub_len = nlub.capacity (); ColumnVector c = (*g) (x); int c_len = c.capacity (); - int ok = nllb_len == nlub_len && nllb_len == c_len; + int ok = - if (! ok && warn) - message (warn_for, "nonlinear constraints have inconsistent dimensions"); + int ok = 1; + if (warn) + { + if (nllb_len == 0 || nlub_len == 0 || c_len == 0) + { + ok = 0; + message (warn_for, + "nonlinear constraints have nonzero dimensions"); + } + else if (nllb_len != nlub_len || nllb_len != c_len) + { + ok = 0; + message (warn_for, + "nonlinear constraints have inconsistent dimensions"); + } return ok; }