Mercurial > octave

diff libinterp/corefcn/dasrt.cc @ 20711:7b608fadc663

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make error messages more specific about the variable and problem encountered. * besselj.cc, bitfcns.cc, colloc.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, dirfns.cc, ellipj.cc, error.cc, gl-render.cc, graphics.cc, graphics.in.h, load-path.cc, lsode.cc, lu.cc, luinc.cc, oct-hist.cc, oct-obj.cc, octave-link.cc, quad.cc, rand.cc, symtab.cc, sysdep.cc, toplev.cc, utils.cc, variables.cc, __init_fltk__.cc, chol.cc, fftw.cc, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-classdef.cc, ov-cx-mat.cc, ov-fcn-inline.cc, ov-struct.cc, ov-usr-fcn.cc, CMatrix.cc, dMatrix.cc, fCMatrix.cc, fMatrix.cc, lo-specfun.cc, curl.m, divergence.m, __fltk_file_filter__.m, __uiobject_split_args__.m, uigetfile.m, doc.m, imshow.m, rref.m, subspace.m, edit.m, fileattrib.m, open.m, substruct.m, annotation.m, axis.m, caxis.m, datetick.m, hidden.m, legend.m, whitebg.m, colorbar.m, __add_datasource__.m, __ezplot__.m, __pie__.m, __plt_get_axis_arg__.m, pan.m, __print_parse_opts__.m, rotate3d.m, subplot.m, zoom.m, compan.m, addpref.m, getpref.m, setpref.m, powerset.m, bicg.m, bicgstab.m, cgs.m, qmr.m, spaugment.m, pascal.m, moment.m, cstrcat.m, system.tst: Make error messages more specific about the variable and problem encountered.
author Rik <rik@octave.org>
date Wed, 18 Nov 2015 10:40:26 -0800
parents 85e5efae848a
children 7164a69472dd
line wrap: on
line diff
--- a/libinterp/corefcn/dasrt.cc	Tue Nov 17 22:04:42 2015 +0100
+++ b/libinterp/corefcn/dasrt.cc	Wed Nov 18 10:40:26 2015 -0800
@@ -471,7 +471,7 @@
       dasrt_cf = args(1).function_value ();
 
       if (! dasrt_cf)
-        DASRT_ABORT1 ("expecting function name as argument 2");
+        DASRT_ABORT1 ("invalid constraint function G");
 
       argp++;
 
@@ -481,19 +481,19 @@
     {
       dasrt_cf = is_valid_function (args(1), "dasrt", true);
       if (! dasrt_cf)
-        DASRT_ABORT1 ("expecting function name as argument 2");
+        DASRT_ABORT1 ("invalid constraint function G");
 
       argp++;
 
       func.set_constraint_function (dasrt_user_cf);
     }
 
-  ColumnVector state = args(argp).xvector_value ("expecting state vector as argument %d", ++argp);
+  ColumnVector state = args(argp).xvector_value ("dasrt: initial state X_0 must be a vector");
 
-  ColumnVector stateprime = args(argp).xvector_value ("expecting time derivative of state vector as argument %d", argp);
+  ColumnVector stateprime = args(argp).xvector_value ("dasrt: initial derivatives XDOT_0 must be a vector");
   argp++;
 
-  ColumnVector out_times = args(argp).xvector_value ("expecting output time vector as %s argument %d", argp);
+  ColumnVector out_times = args(argp).xvector_value ("dasrt: output time variable T must be a vector");
   argp++;
 
   double tzero = out_times (0);
@@ -504,7 +504,7 @@
 
   if (argp < nargin)
     {
-      crit_times = args(argp).xvector_value ("expecting critical time vector as argument %d", argp);
+      crit_times = args(argp).xvector_value ("dasrt: list of critical times T_CRIT must be a vector");
       argp++;
 
       crit_times_set = true;