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
@@ -27,10 +27,13 @@
   ###############################################################
   ## Version control history
   ###############################################################
   ## $Id$
   ## $Log$
+  ## Revision 1.11  2002/05/20 13:32:36  gawthrop
+  ## Sanity check on y_0
+  ##
   ## Revision 1.10  2002/05/13 16:01:09  gawthrop
   ## Addes Q weighting matrix
   ##
   ## Revision 1.9  2002/05/08 10:14:21  gawthrop
   ## Idetification now OK (Moved data range in ppp_optimise by one sample interval)
@@ -118,29 +121,35 @@
   
   while (abs(reduction)>extras.criterion)&&\
 	(abs(err)>extras.criterion)&&\
 	(iterations<extras.max_iterations)
 
-    iterations = iterations + 1; # Increment iteration counter
+    iterations = iterations + 1 # Increment iteration counter
 
     [y,y_par,x] = eval(sim_command); # Simulate
-    [N_data,N_y] = size(y);
+    [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);
     endif
 
-    if ( (N_data-n_data)<1 )
-      error(sprintf("y_0 (%i) must be shorter than y (%i)", n_data, N_data));
+    ## Use the last part of the simulation to compare with data
+    ## ### Removed #### And shift back by one data point
+#     if ( (N_data-n_data)<1 )
+#       error(sprintf("y_0 (%i) must be shorter than y (%i)", n_data, N_data));
+#     endif
+    
+    y = y(N_data-n_data+1:N_data,:);
+    y_par = y_par(N_data-n_data+1:N_data,:);
+
+    if extras.visual==1
+      ## Plot
+      title("Optimisation data");
+      plot([y y_0])
     endif
     
-    ## Use the last part of the simulation to compare with data
-    ## And shift back by one data point
-    y = y(N_data-n_data:N_data-1,:);
-    y_par = y_par(N_data-n_data:N_data-1,:);
-
     ##Evaluate error, cost derivative J and cost second derivative JJ
     err = 0; 
     J = zeros(n_th,1);
     JJ = zeros(n_th,n_th);