Overview
Comment:Added iteration count to output args
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | origin/master | trunk
Files: files | file ages | folders
SHA3-256: 239edc5052248e577f93a279c8ca023acacea8c9be7dcdf763964e95452621d3
User & Date: gawthrop@users.sourceforge.net on 2002-05-02 15:02:12.000
Other Links: branch diff | manifest | tags
Context
2002-05-02
16:10:39
Preliminary working version - ok with rc_PPP check-in: f13b092674 user: gawthrop@users.sourceforge.net tags: origin/master, trunk
15:02:12
Added iteration count to output args check-in: 239edc5052 user: gawthrop@users.sourceforge.net tags: origin/master, trunk
11:10:11
s/loctave/loctinterp/ check-in: 1f05367ea6 user: geraint@users.sourceforge.net tags: origin/master, trunk
Changes
Side-by-Side Diff Ignore Whitespace Patch
Modified mttroot/mtt/lib/control/PPP/ppp_nlin.m from [2bca370978] to [543adc29f3]. 
1

2
3

4
5
6
7
8
9
10


1
2

3
4
5
6
7
8
9
10

-
+

-
+








function [U, U_all, Error, Y] = ppp_nlin (system_name,x_0,par_0,sim,us,w,free,extras)
function [U, U_all, Error, Y, its] = ppp_nlin (system_name,x_0,par_0,sim,us,w,free,extras)

  ## usage:  [U, U_all, Error, Y] = ppp_nlin (system_name,x_0,par_0,sim,us,w,free,extras)
  ## usage:  [U, U_all, Error, Y,its ] = ppp_nlin (system_name,x_0,par_0,sim,us,w,free,extras)
  ##
  ## 
  
  if nargin<8
    extras.criterion = 1e-8;
    extras.max_iterations = 10;
    extras.v = 0.1;
︙
19
20
21
22
23
24
25
26

27
28
29
30
31
32
33

19
20
21
22
23
24
25

26
27
28
29
30
31
32
33








-
+








  
  ## Checks
  if (n_us<>n_u)
    error(sprintf("Inputs (%i)  differenct to system inputs (%i)", n_us, n_u));
  endif
    
  ##Optimise
  [par,Par,Error,Y] = ppp_optimise(s_system_name,x_0,par_0,sim,us,w,free,extras);
  [par,Par,Error,Y,its] = ppp_optimise(s_system_name,x_0,par_0,sim,us,w,free,extras);
  
  U = par(free(:,1));
  U_all = Par(free(:,1),:);
endfunction
MTT: Model Transformation Tools
[ GitHub | SourceHut | Sourceforge | Fossil RSS ]