Mercurial > hg > octave-jordi
diff src/npsol.cc @ 628:aecbe369233b
[project @ 1994-08-19 13:27:51 by jwe]
author | jwe |
---|---|
date | Fri, 19 Aug 1994 13:37:34 +0000 |
parents | 8e4e7e5f307e |
children | fae2bd91c027 |
line wrap: on
line diff
--- a/src/npsol.cc +++ b/src/npsol.cc @@ -157,7 +157,7 @@ if (tmp.length () > 0 && tmp(0).is_defined ()) { - retval = tmp(0).to_vector (); + retval = tmp(0).vector_value (); if (retval.length () <= 0) error ("npsol: error evaluating constraints"); @@ -294,7 +294,7 @@ return retval; } - ColumnVector x = args(1).to_vector (); + ColumnVector x = args(1).vector_value (); if (x.capacity () == 0) { @@ -314,8 +314,8 @@ Bounds bounds; if (nargin == 5 || nargin == 8 || nargin == 11) { - ColumnVector lb = args(3).to_vector (); - ColumnVector ub = args(4).to_vector (); + ColumnVector lb = args(3).vector_value (); + ColumnVector ub = args(4).vector_value (); int lb_len = lb.capacity (); int ub_len = ub.capacity (); @@ -365,9 +365,9 @@ { if (! npsol_constraints) { - ColumnVector lub = args(nargin-1).to_vector (); - Matrix c = args(nargin-2).to_matrix (); - ColumnVector llb = args(nargin-3).to_vector (); + ColumnVector lub = args(nargin-1).vector_value (); + Matrix c = args(nargin-2).matrix_value (); + ColumnVector llb = args(nargin-3).vector_value (); if (llb.capacity () == 0 || lub.capacity () == 0) { @@ -402,8 +402,8 @@ { if (takes_correct_nargs (npsol_constraints, 2, "npsol", 1)) { - ColumnVector nlub = args(nargin-1).to_vector (); - ColumnVector nllb = args(nargin-3).to_vector (); + ColumnVector nlub = args(nargin-1).vector_value (); + ColumnVector nllb = args(nargin-3).vector_value (); NLFunc const_func (npsol_constraint_function); @@ -445,8 +445,8 @@ { if (takes_correct_nargs (npsol_constraints, 2, "npsol", 1)) { - ColumnVector nlub = args(nargin-1).to_vector (); - ColumnVector nllb = args(nargin-3).to_vector (); + ColumnVector nlub = args(nargin-1).vector_value (); + ColumnVector nllb = args(nargin-3).vector_value (); NLFunc const_func (npsol_constraint_function); @@ -456,9 +456,9 @@ NLConst nonlinear_constraints (nllb, const_func, nlub); - ColumnVector lub = args(nargin-4).to_vector (); - Matrix c = args(nargin-5).to_matrix (); - ColumnVector llb = args(nargin-6).to_vector (); + ColumnVector lub = args(nargin-4).vector_value (); + Matrix c = args(nargin-5).matrix_value (); + ColumnVector llb = args(nargin-6).vector_value (); if (llb.capacity () == 0 || lub.capacity () == 0) {