Index: mttroot/mtt/lib/comp/compound/Sensitivity/sEMTF/sEMTF_lbl.txt
==================================================================
--- mttroot/mtt/lib/comp/compound/Sensitivity/sEMTF/sEMTF_lbl.txt
+++ mttroot/mtt/lib/comp/compound/Sensitivity/sEMTF/sEMTF_lbl.txt
@@ -1,14 +1,31 @@
 %% Label file for system sEMTF (sEMTF_lbl.txt)
 %SUMMARY sEMTF Effort modulated TF - sensitivity version
-%DESCRIPTION 
+%DESCRIPTION It is assumed that no sensitivity parameter is associated
+%DESCRIPTION with this component.
+%DESCRIPTION This is a built out of EMTFs and the 4 port AE3 component
+%DESCRIPTION There is one argument alias - the transformer (flow) gain 
+%DESCRIPTION There are two CR aliases: one for the EMTF and one for
+%DESCRIPTION the AE3
+%DESCRIPTION Examples:
+%DESCRIPTION   lin;slin  n
+%DESCRIPTION   lsin;slsin l
+%DESCRIPTION   lcos;slcos l
+
+
 
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % %% Version control history
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % %% $Id$
 % %% $Log$
+% %% Revision 1.2  2002/06/10 08:27:33  gawthrop
+% %% Updated description
+% %%
+% %% Revision 1.1  2002/04/17 18:50:35  gawthrop
+% %% Sensitivity EMTF components
+% %%
 % %% Revision 1.1  2000/12/28 17:29:10  peterg
 % %% To RCS
 % %%
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

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,16 @@
   ###############################################################
   ## Version control history
   ###############################################################
   ## $Id$
   ## $Log$
+  ## Revision 1.12  2002/06/11 11:25:25  gawthrop
+  ## No longer delay the simulated data.
+  ##
+  ## 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 +124,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);
    

Index: mttroot/mtt/lib/cr/r/slin.cr
==================================================================
--- mttroot/mtt/lib/cr/r/slin.cr
+++ mttroot/mtt/lib/cr/r/slin.cr
@@ -38,7 +38,34 @@
        input, causality, 1,
        sinput, causality, 2)
          = lin(gain_causality, gain, other_causality, 1, 
                sinput, causality, 1);
          
+
+%% This is the version to go with sEMTF
+%% It is the CR passed to the AE3 components
+
+%DESCRIPTION four port component - effort i/o
+FOR ALL gain, input, junk, m_input, dm_input
+LET slin(gain, effort, 2, 
+	input, effort, 1,
+	junk, flow, 2,
+	m_input, effort, 3,
+        dm_input,effort, 4)
+	 = gain*dm_input*input;
+
+%DESCRIPTION four port component - flow i/o
+FOR ALL gain, input, junk, m_input, dm_input
+LET slin(gain, flow, 2, 
+	input, flow, 1,
+	junk, effort, 2,
+	m_input, effort, 3,
+        dm_input,effort, 4)
+	 = gain*dm_input*input;
+
 END;;
+
+
+
+
+
 

Index: mttroot/mtt/lib/rep/sfun_rep.sh
==================================================================
--- mttroot/mtt/lib/rep/sfun_rep.sh
+++ mttroot/mtt/lib/rep/sfun_rep.sh
@@ -8,11 +8,11 @@
 
 
 set_debug ()
 {
     debug=$1
-    if [ $debug -eq 1 ]; then
+    if ( $debug ); then
 	set -x
 	make_debug='--debug=a'
     else
 	set +x
 	make_debug=''
@@ -31,14 +31,11 @@
     exit errno;
 }       
 
 check_for_valid_input ()
 {
-    args="$*"
-    if [ $# -neq 4 ]; then
-	exit_error "Invalid Input"
-    fi
+    return 0;
 }
 
 #
 # file templates
 #
@@ -1377,10 +1374,10 @@
 
 
 
 ### main program
 
-#set_debug 0
-#check_for_valid_input "$*"
+set_debug false
+check_for_valid_input "$*"
 
 OPTS="$1" SYS="$2" REP="$3" LANG="$4" make $make_debug -f ${MTT_REP}/sfun_rep/Makefile ${2}_${3}.${4}
 exit 0

Index: mttroot/mtt/lib/rep/sfun_rep/Makefile
==================================================================
--- mttroot/mtt/lib/rep/sfun_rep/Makefile
+++ mttroot/mtt/lib/rep/sfun_rep/Makefile
@@ -1,27 +1,27 @@
 #! /usr/bin/make -f
 
 all: $(SYS)_sfun.mexglx
 
-$(SYS)_sfun.mexglx: $(SYS)_sfun.c sfun_debug.h useful-functions.hh $(SYS)_def.h $(SYS)_sympar.h $(SYS)_numpar.c $(SYS)_ode.c $(SYS)_odeo.c $(SYS)_state.c $(SYS)_sfun_ae.mexglx $(SYS)_sfun_input.mexglx $(SYS)_sfun_interface.mexglx $(SYS).mdl
+$(SYS)_sfun.mexglx: $(SYS)_sfun.c sfun_debug.h useful-functions.hh $(SYS)_def.h $(SYS)_sympar.h $(SYS)_cr.h $(SYS)_numpar.c $(SYS)_ode.c $(SYS)_odeo.c $(SYS)_state.c $(SYS)_sfun_ae.mexglx $(SYS)_sfun_input.mexglx $(SYS)_sfun_interface.mexglx $(SYS).mdl
 	echo Creating $@
 	mex $(SYS)_sfun.c
 	cp *_sfun*mexglx $(SYS).mdl ..
 
 $(SYS)_sfun.c:: ${MTT_REP}/sfun_rep/sfun.c.tmpl
 	echo Creating $@
 	cat $^ | sed 's/<mtt_model_name>/$(SYS)/g' > $@
 
-$(SYS)_sfun_ae.mexglx: $(SYS)_sfun_ae.c sfun-debug.h useful-functions.hh $(SYS)_def.h $(SYS)_sympar.h $(SYS)_ae.c
+$(SYS)_sfun_ae.mexglx: $(SYS)_sfun_ae.c sfun_debug.h useful-functions.hh $(SYS)_def.h $(SYS)_sympar.h $(SYS)_cr.h $(SYS)_ae.c
 	echo Creating $@
 	mex $(SYS)_sfun_ae.c
 
 $(SYS)_sfun_ae.c:: ${MTT_REP}/sfun_rep/mex_ae.c.tmpl
 	echo Creating $@
 	cat $^ | sed 's/<mtt_model_name>/$(SYS)/g' > $@
 
-$(SYS)_sfun_input.mexglx: $(SYS)_sfun_input.c sfun_debug.h useful-functions.hh $(SYS)_def.h $(SYS)_sympar.h $(SYS)_input.c $(SYS)_numpar.c
+$(SYS)_sfun_input.mexglx: $(SYS)_sfun_input.c sfun_debug.h useful-functions.hh $(SYS)_def.h $(SYS)_sympar.h $(SYS)_cr.h $(SYS)_input.c $(SYS)_numpar.c
 	echo Creating $@
 	mex $(SYS)_sfun_input.c
 
 $(SYS)_sfun_input.c:: ${MTT_REP}/sfun_rep/sfun_input.c.tmpl
 	echo Creating $@
@@ -36,11 +36,11 @@
 	cat ${MTT_REP}/sfun_rep/sfun_interface.c.tmpl	|\
 	 sed 's/<mtt_model_name>/$(SYS)/g'		|\
 	 ${MTT_REP}/sfun_rep/insert_file.sh > $@
 
 $(SYS)_sfun.zip: $(SYS)_sfun.c sfun_debug.h useful-functions.hh $(SYS)_sfun_ae.c $(SYS)_sfun_input.c $(SYS)_sfun_interface.c \
-	 $(SYS)_def.h $(SYS)_sympar.h \
+	 $(SYS)_def.h $(SYS)_sympar.h $(SYS)_cr.h\
 	 $(SYS)_ae.c $(SYS)_input.c $(SYS)_numpar.c $(SYS)_ode.c $(SYS)_odeo.c $(SYS)_state.c \
 	 $(SYS).mdl README
 	echo Creating $@
 	zip $@ $^
 

Index: mttroot/mtt/lib/rep/sfun_rep/mdl.tmpl
==================================================================
--- mttroot/mtt/lib/rep/sfun_rep/mdl.tmpl
+++ mttroot/mtt/lib/rep/sfun_rep/mdl.tmpl
@@ -1,7 +1,7 @@
 Model {
-  Name			  "<mtt_model_name>"
+  Name			  "mdl"
   Version		  4.00
   SampleTimeColors	  off
   LibraryLinkDisplay	  "all"
   WideLines		  off
   ShowLineDimensions	  on
@@ -25,12 +25,12 @@
   Creator		  "geraint"
   UpdateHistory		  "UpdateHistoryNever"
   ModifiedByFormat	  "%<Auto>"
   LastModifiedBy	  "geraint"
   ModifiedDateFormat	  "%<Auto>"
-  LastModifiedDate	  "Thu May 23 16:35:42 2002"
-  ModelVersionFormat	  "1.%<AutoIncrement:13>"
+  LastModifiedDate	  "Tue Jun 18 18:49:28 2002"
+  ModelVersionFormat	  "1.%<AutoIncrement:14>"
   ConfigurationManager	  "None"
   SimParamPage		  "Solver"
   StartTime		  "0.0"
   StopTime		  "10.0"
   SolverMode		  "Auto"
@@ -152,12 +152,12 @@
     FontSize		    9
     FontWeight		    "normal"
     FontAngle		    "normal"
   }
   System {
-    Name		    "<mtt_model_name>"
-    Location		    [51, 441, 346, 574]
+    Name		    "mdl"
+    Location		    [61, 487, 356, 620]
     Open		    on
     ModelBrowserVisibility  off
     ModelBrowserWidth	    200
     ScreenColor		    "white"
     PaperOrientation	    "landscape"
@@ -188,11 +188,11 @@
       RTWSystemCode	      "Auto"
       RTWFcnNameOpts	      "Auto"
       RTWFileNameOpts	      "Auto"
       System {
 	Name			"MTT Model\n<mtt_model_name>"
-	Location		[45, 448, 1008, 720]
+	Location		[55, 494, 1018, 766]
 	Open			off
 	ModelBrowserVisibility	off
 	ModelBrowserWidth	200
 	ScreenColor		"white"
 	PaperOrientation	"landscape"
@@ -254,10 +254,26 @@
 	    LinearAnalysisOutput    off
 	    LinearAnalysisInput	    off
 	    RTWStorageClass	    "Auto"
 	  }
 	}
+	Block {
+	  BlockType		  Memory
+	  Name			  "Memory"
+	  Position		  [870, 80, 900, 110]
+	  X0			  "0"
+	  InheritSampleTime	  off
+	  RTWStateStorageClass	  "Auto"
+	}
+	Block {
+	  BlockType		  Memory
+	  Name			  "Memory1"
+	  Position		  [860, 175, 890, 205]
+	  X0			  "0"
+	  InheritSampleTime	  off
+	  RTWStateStorageClass	  "Auto"
+	}
 	Block {
 	  BlockType		  "S-Function"
 	  Name			  "S-Function"
 	  Ports			  [4, 2]
 	  Position		  [710, 47, 840, 238]
@@ -306,29 +322,41 @@
 	  SrcBlock		  "MTT Model Inputs"
 	  SrcPort		  1
 	  DstBlock		  "S-Function"
 	  DstPort		  1
 	}
-	Line {
-	  SrcBlock		  "S-Function"
-	  SrcPort		  1
-	  Points		  [30, 0; 0, -70; -850, 0; 0, 105]
-	  DstBlock		  "MTT Plant Model"
-	  DstPort		  1
-	}
 	Line {
 	  SrcBlock		  "In1"
 	  SrcPort		  1
 	  DstBlock		  "S-Function"
 	  DstPort		  4
 	}
 	Line {
 	  SrcBlock		  "S-Function"
-	  SrcPort		  2
+	  SrcPort		  1
+	  DstBlock		  "Memory"
+	  DstPort		  1
+	}
+	Line {
+	  SrcBlock		  "Memory"
+	  SrcPort		  1
+	  Points		  [0, -55; -855, 0]
+	  DstBlock		  "MTT Plant Model"
+	  DstPort		  1
+	}
+	Line {
+	  SrcBlock		  "Memory1"
+	  SrcPort		  1
 	  DstBlock		  "Out1"
 	  DstPort		  1
 	}
+	Line {
+	  SrcBlock		  "S-Function"
+	  SrcPort		  2
+	  DstBlock		  "Memory1"
+	  DstPort		  1
+	}
       }
     }
     Block {
       BlockType		      Outport
       Name		      "Out1"

Index: mttroot/mtt/lib/rep/sfun_rep/mex_ae.c.tmpl
==================================================================
--- mttroot/mtt/lib/rep/sfun_rep/mex_ae.c.tmpl
+++ mttroot/mtt/lib/rep/sfun_rep/mex_ae.c.tmpl
@@ -9,10 +9,11 @@
 #include <mex.h>
 #include "sfun_debug.h"
 #include "useful-functions.hh"
 #include "<mtt_model_name>_def.h"
 #include "<mtt_model_name>_sympar.h"
+#include "<mtt_model_name>_cr.h"
 
 /* utility procedures */
 
 double *
 array_of_double (size_t n)

Index: mttroot/mtt/lib/rep/sfun_rep/sfun.c.tmpl
==================================================================
--- mttroot/mtt/lib/rep/sfun_rep/sfun.c.tmpl
+++ mttroot/mtt/lib/rep/sfun_rep/sfun.c.tmpl
@@ -12,10 +12,11 @@
 #include "simstruc.h"
 #include "sfun_debug.h"
 #include "useful-functions.hh"
 #include "<mtt_model_name>_def.h"
 #include "<mtt_model_name>_sympar.h"
+#include "<mtt_model_name>_cr.h"
 
 static double *mttdx;		/* pointer to rates */
 static double *mttu;		/* pointer to inputs */
 static double *mttpar;		/* pointer to parameters */
 static double *mttx;		/* pointer to states */
@@ -162,12 +163,12 @@
   for (i = 0; i < MTTNPAR; i++) {
     p[i] = mttpar[i];
   }
   mexPutArray (MTT_MATLAB_P, "base");
 
-  /* call fsolve */
-  mexEvalString ("MTT_Ui = fsolve (@<mtt_model_name>_sfun_ae, MTT_Ui, optimset('display','off'), MTT_X, MTT_U, MTT_T, MTT_P);");
+  /* call solver */
+  mexEvalString ("MTT_Ui = lsqnonlin (@<mtt_model_name>_sfun_ae, MTT_Ui, [], [], optimset('display','off','diagnostics','off','TolX',1e-2,'TolFun',1e-2), MTT_X, MTT_U, MTT_T, MTT_P);");
 
   /* retrieve result */
   MTT_MATLAB_Ui = mexGetArray ("MTT_Ui", "base");
   p = mxGetPr (MTT_MATLAB_Ui);
   for (i = 0; i < MTTNYZ; i++) {

Index: mttroot/mtt/lib/rep/sfun_rep/sfun_input.c.tmpl
==================================================================
--- mttroot/mtt/lib/rep/sfun_rep/sfun_input.c.tmpl
+++ mttroot/mtt/lib/rep/sfun_rep/sfun_input.c.tmpl
@@ -12,10 +12,11 @@
 #include "simstruc.h"
 #include "sfun_debug.h"
 #include "useful-functions.hh"
 #include "<mtt_model_name>_def.h"
 #include "<mtt_model_name>_sympar.h"
+#include "<mtt_model_name>_cr.h"
 
 static double *mttu;		/* pointer to inputs */
 static double *mttpar;		/* pointer to parameters */
 static double *mttx;		/* pointer to states */
 static double *mtty;		/* pointer to outputs */