From: <par...@us...> - 2012-09-17 05:51:51
|
Revision: 11039 http://octave.svn.sourceforge.net/octave/?rev=11039&view=rev Author: paramaniac Date: 2012-09-17 05:51:45 +0000 (Mon, 17 Sep 2012) Log Message: ----------- control: touch up time response draft code Modified Paths: -------------- trunk/octave-forge/main/control/devel/__time_response_2__.m Modified: trunk/octave-forge/main/control/devel/__time_response_2__.m =================================================================== --- trunk/octave-forge/main/control/devel/__time_response_2__.m 2012-09-16 22:39:23 UTC (rev 11038) +++ trunk/octave-forge/main/control/devel/__time_response_2__.m 2012-09-17 05:51:45 UTC (rev 11039) @@ -104,11 +104,11 @@ switch (resptype) case "initial" - [y, x] = cellfun (@__initial_response__, sys_cell, sys_dt_cell, t, {x0} or x0); + [y, x] = cellfun (@__initial_response__, sys_dt_cell, t, {x0} or x0, "uniformoutput", false); case "step" - [y, x] = cellfun (@__step_response__, sys_dt_cell, t); + [y, x] = cellfun (@__step_response__, sys_dt_cell, t, "uniformoutput", false); case "impulse" - [y, x] = cellfun (@__impulse_response__, sys_cell, sys_dt_cell, t); + [y, x] = cellfun (@__impulse_response__, sys_cell, sys_dt_cell, t, "uniformoutput", false); otherwise error ("time_response: invalid response type"); endswitch @@ -251,10 +251,9 @@ -function [y, x_arr] = __initial_response__ (sys, sys_dt, t, x0) +function [y, x_arr] = __initial_response__ (sys_dt, t, x0) - [A, B, C, D] = ssdata (sys); - [F, G] = ssdata (sys_dt); + [F, G, C, D] = ssdata (sys_dt); n = rows (F); # number of states m = columns (G); # number of inputs @@ -314,8 +313,8 @@ function [y, x_arr] = __impulse_response__ (sys, sys_dt, t) - [A, B, C, D, dt] = ssdata (sys); - [F, G] = ssdata (sys_dt); + [~, B, ~, ~, dt] = ssdata (sys); + [F, G, C, D] = ssdata (sys_dt); discrete = ! isct (sys); n = rows (F); # number of states This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |