Index: mttroot/mtt/lib/control/PPP/ppp_optimise.m
==================================================================
--- mttroot/mtt/lib/control/PPP/ppp_optimise.m
+++ mttroot/mtt/lib/control/PPP/ppp_optimise.m
@@ -1,9 +1,9 @@
-function [par,Par,Error,Y,iterations] = \
+function [par,Par,Error,Y,iterations,x] = \
       ppp_optimise(system_name,x_0,par_0,simpar,u,y_0,free,extras);
   ## Levenberg-Marquardt optimisation for PPP/MTT
-  ## Usage: [par,Par,Error,Y,iterations] = ppp_optimise(system_name,x_0,par_0,simpar,u,y_0,free[,extras]);
+  ## Usage: [par,Par,Error,Y,iterations,x] = ppp_optimise(system_name,x_0,par_0,simpar,u,y_0,free[,extras]);
   ##  system_name     String containing system name
   ##  x_0             Initial state
   ##  par_0           Initial parameter vector estimate
   ##  simpar          Simulation parameters:
   ##        .first      first time
@@ -26,10 +26,13 @@
   ###############################################################
   ## Version control history
   ###############################################################
   ## $Id$
   ## $Log$
+  ## Revision 1.4  2001/05/26 15:46:38  gawthrop
+  ## Updated to account for new nonlinear ppp
+  ##
   ## Revision 1.3  2001/04/05 11:50:12  gawthrop
   ## Tidied up documentation + verbose mode
   ##
   ## Revision 1.2  2001/04/04 08:36:25  gawthrop
   ## Restuctured to be more logical.
@@ -95,11 +98,11 @@
 	(abs(error)>extras.criterion)&&\
 	(iterations<extras.max_iterations)
 
     iterations = iterations + 1; # Increment iteration counter
 
-    [y,y_par] = eval(sim_command); # Simulate
+    [y,y_par,x] = eval(sim_command); # Simulate
     [N_data,N_y] = size(y);
 
     if (N_y!=n_y)
       mess = sprintf("n_y (%i) in data not same as n_y (%i) in model", n_y,N_y);
       error(mess);