From: <par...@us...> - 2011-12-05 21:39:51
|
Revision: 9279 http://octave.svn.sourceforge.net/octave/?rev=9279&view=rev Author: paramaniac Date: 2011-12-05 21:39:45 +0000 (Mon, 05 Dec 2011) Log Message: ----------- control-devel: minor changes Modified Paths: -------------- trunk/octave-forge/extra/control-devel/inst/__conred_sb16ad__.m trunk/octave-forge/extra/control-devel/inst/__modred_ab09id__.m trunk/octave-forge/extra/control-devel/inst/cfconred.m Modified: trunk/octave-forge/extra/control-devel/inst/__conred_sb16ad__.m =================================================================== --- trunk/octave-forge/extra/control-devel/inst/__conred_sb16ad__.m 2011-12-05 21:38:15 UTC (rev 9278) +++ trunk/octave-forge/extra/control-devel/inst/__conred_sb16ad__.m 2011-12-05 21:39:45 UTC (rev 9279) @@ -136,7 +136,7 @@ scaled = __modred_check_equil__ (val); otherwise - warning ("modred: invalid property name ""%s"" ignored", key); + warning ("%sconred: invalid property name ""%s"" ignored", method, key); endswitch endfor @@ -151,7 +151,7 @@ elseif (method == "spa" && bf) # 'P': use the balancing-free square-root Singular Perturbation Approximation method jobmr = 3; else - error ("modred: invalid jobmr option"); # this should never happen + error ("%smodred: invalid jobmr option"); # this should never happen endif Modified: trunk/octave-forge/extra/control-devel/inst/__modred_ab09id__.m =================================================================== --- trunk/octave-forge/extra/control-devel/inst/__modred_ab09id__.m 2011-12-05 21:38:15 UTC (rev 9278) +++ trunk/octave-forge/extra/control-devel/inst/__modred_ab09id__.m 2011-12-05 21:39:45 UTC (rev 9279) @@ -119,7 +119,7 @@ scaled = __modred_check_equil__ (val); otherwise - warning ("modred: invalid property name ""%s"" ignored", key); + warning ("%smodred: invalid property name ""%s"" ignored", method, key); endswitch endfor Modified: trunk/octave-forge/extra/control-devel/inst/cfconred.m =================================================================== --- trunk/octave-forge/extra/control-devel/inst/cfconred.m 2011-12-05 21:38:15 UTC (rev 9278) +++ trunk/octave-forge/extra/control-devel/inst/cfconred.m 2011-12-05 21:39:45 UTC (rev 9279) @@ -98,7 +98,7 @@ nkv = numel (varargin); # number of keys and values if (rem (nkv, 2)) - error ("%sconred: keys and values must come in pairs", method); + error ("cfconred: keys and values must come in pairs"); endif [a, b, c, d, tsam, scaled] = ssdata (Go); @@ -146,7 +146,7 @@ case {"b", "p"} # both, performance weight = 3; otherwise - error ("%sconred: ""%s"" is an invalid value for key weight", method, val); + error ("cfconred: ""%s"" is an invalid value for key weight", val); endswitch case {"order", "ncr", "nr"} @@ -177,7 +177,7 @@ scaled = __modred_check_equil__ (val); otherwise - warning ("modred: invalid property name ""%s"" ignored", key); + warning ("cfconred: invalid property name ""%s"" ignored", key); endswitch endfor This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |