Index: mttroot/mtt/bin/trans/mtt_header
==================================================================
--- mttroot/mtt/bin/trans/mtt_header
+++ mttroot/mtt/bin/trans/mtt_header
@@ -10,10 +10,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.10  2000/11/07 17:20:51  peterg
+## useful-functions.hh now included locally
+##
 ## Revision 1.9  2000/11/07 16:56:24  peterg
 ## Version from Geraint
 ##
 ## Revision 1.2  2000/11/03 00:55:42  geraint
 ## typo: missed out 'd' in mttedx
@@ -50,10 +53,11 @@
 
 # Arguments
 system=$1
 rep=$2
 language=$3
+fun_name=${1}_${2}
 #args=$4
 #output=$5
 #extras=$6
 
 # Find system constants
@@ -94,17 +98,20 @@
 	states=yes;
 	inputs=no;
 	parameters=yes;
         output=mttu
         args=$inputeqnargs
+        declareinputs=yes
 	;;
     logic)
 	states=no;
 	inputs=no;
 	parameters=yes;
-        output=open
+        output=mttopen
         args=$eqnargs
+        declareinputs=yes
+        declarestates=yes
 	;;
     numpar)
 	states=no;
 	inputs=no;
 	parameters=no;
@@ -122,29 +129,51 @@
         inputs=yes;
 	parameters=yes;
         output='mtty'
         args=$eqnargs
 	;;
+    ode2odes)
+	states=no;
+        inputs=no;
+	parameters=no;
+        output='y,x,t'
+        args='x,par,simpar'
+	;;
     simpar)
 	states=no;
 	inputs=no;
 	parameters=no;
-        output='mttsimpar_map'
+        output='mttsimpar'
 	;;
     sm)
 	states=no;
 	inputs=no;
 	parameters=yes;
         output='mtta,mttb,mttc,mttd'
         args=mttpar
 	;;
+    smxa)
+	states=no;
+        inputs=no;
+	parameters=yes;
+        output='mtta'
+        args=$eqnargs
+	;;
+    smxax)
+	states=no;
+        inputs=no;
+	parameters=yes;
+        output='mttax'
+        args=$eqnargs
+	;;
     state)
 	states=no;
 	inputs=no;
 	parameters=yes;
         output=mttx
         args=mttpar
+        declarestates=yes
 	;;
     *)
 	echo Representation $rep not supported - sorry; exit 1
 esac
 
@@ -167,10 +196,13 @@
 	function="function"
 	declaration="$Output$1_$rep$Args;"
 	noglobals=true; # Fudge to make mtt_m2p work
         start='## BEGIN Code'
         finish='## END Code'
+        var_declaration=$Lc
+        declarestates=no
+        declareinputs=no
 	;;
     txt)
 	modeline='## -*-octave-*- Put Emacs into octave-mode ##';
 	Lc='##';
 	Rc='';
@@ -180,20 +212,90 @@
 	declaration=""
         start=''
         parameters=no
 	states=no
 	inputs=no
+        declarestates=no
+        declareinputs=no
 	;;
     oct)
 	modeline="// -*-c++-*- Put Emacs into c++-mode";
 	Lc='//';
 	oct_header=yes;
+        constant_declaration="const double "
+        var_declaration="double "
+	minusone="-1"
+	map="_map"
 	;;
     *)
 	echo Language $language not supported - sorry; exit 1
 esac
 
+if [ "$rep" = "simpar" ]; then
+   output=${output}${map}    # Output is simpar_map in this case
+fi
+
+function declare_vars(){
+# Grab the names
+names=`awk '{if ($1==var_type) print tolower($4)}' var_type=$1 ${system}_struc.txt`
+
+# Comments
+cat <<EOF
+
+$Lc  Declarations for $1 names $Rc
+EOF
+# Declarations
+for name in $names; do
+    echo '  '$var_declaration $name';'
+done
+}
+
+
+function array2constant() {
+# Parameters
+if [ "$parameters" = "yes" ]; then
+cat <<EOF
+
+$Lc Parameters $Rc
+EOF
+sympar2par_txt2m ${system} ""  "$constant_declaration" "$minusone"
+fi
+
+# States
+if [ "$states" = "yes" ]; then
+cat <<EOF
+
+$Lc States $Rc
+EOF
+N=`n2m 1 $Nx`
+for i in $N; do
+    echo $constant_declaration 'mttx'$i' = mttx('$i$minusone');'
+done
+fi
+
+if [ "$declarestates" = "yes" ]; then
+  declare_vars state
+fi
+
+# Inputs
+if [ "$inputs" = "yes" ]; then
+cat <<EOF
+
+$Lc Inputs $Rc
+EOF
+
+N=`n2m 1 $Nu`
+for i in $N; do
+  echo $constant_declaration 'mttu'$i' = mttu('$i$minusone');'
+done
+fi
+
+if [ "$declareinputs" = "yes" ]; then
+  declare_vars input
+fi
+
+}
 
 # Argument specific stuff
 function get_arg_specific_stuff ()
 {
     arg_name=${1:-""}
@@ -212,11 +314,11 @@
 	    ;;
 	mttd)
 	    arg_type="Matrix"
 	    arg_size="(MTTNY,MTTNU)"
 	    ;;
-	mttax | mttdx | mttedx | mttx | open)
+	mttax | mttdx | mttedx | mttx | mttopen)
 	    arg_type="ColumnVector"
 	    arg_size="(MTTNX)"
 	    ;;
 	mttpar)
 	    arg_type="ColumnVector"
@@ -309,11 +411,12 @@
 #include "useful-functions.hh"
 #include "${system}_def.h"
 #include "${system}_sympar.h"
 
 DEFUN_DLD (${system}_${rep}, args, ,
-"Octave ${rep} representation of system ${system}
+"Usage: [$output] = ${system}_${rep}($args)
+Octave ${rep} representation of system ${system}
 Generated by MTT on $(date)")
 {
 
   octave_value_list retval;
 
@@ -325,11 +428,11 @@
 {
     s=${1:-""}					# comma separated input list
     if [ -z ${s} ];then return; fi
     c=$(get_field ${s} 0)			# count of inputs
     i=0
-    printf "  if (${c} != args.length ()) usage (\"expected ${c} argument(s): ${s}\");\n\n"
+    printf "  if (${c} != args.length ()) usage (\"${fun_name} expected ${c} argument(s): ${s}\");\n\n"
     while [ ${i} -lt ${c} ]; do
 	j=${i}
 	i=$((${i} + 1))
 	w=$(get_field ${s} ${i})		# argument name
 	get_arg_specific_stuff ${w}
@@ -355,15 +458,10 @@
 	i=$((${i} + 1))
 	w=$(get_field ${s} ${i})		# argument name
 	get_arg_specific_stuff ${w}
 	printf "  ${arg_type}\t${w}\t${arg_size};\n"
     done
-    cat <<EOF
-
-// BEGIN Code
-
-EOF
 }
 
 
 function return_DLD_outputs ()
 {
@@ -398,10 +496,16 @@
 if [ ${language} = "oct" ];then
     write_DLD_header
     map_DLD_inputs ${args}
     undeclared=$(get_extra_fields ${args:-"nil"} ${output:-"nil"})
     declare_DLD_outputs ${undeclared}
+    array2constant
+    cat <<EOF
+
+// BEGIN Code
+
+EOF
     return_DLD_outputs ${output}
 else
 
 if [ -n "$noglobals" ]; then
 cat<<EOF
@@ -410,43 +514,13 @@
 global ...
 mtt_no_globals ;
 EOF
 fi
 
+## Arrays 
+array2constant
+
 # Mark start of code
 echo
 echo $start
 
-# Parameters
-if [ "$parameters" = "yes" ]; then
-cat <<EOF
-
-$Lc Parameters $Rc
-EOF
-sympar2par_txt2m $1 
-fi
-# States
-if [ "$states" = "yes" ]; then
-cat <<EOF
-
-$Lc States $Rc
-EOF
-N=`n2m 1 $Nx`
-for i in $N; do
-    echo '  mttx'$i' = mttx('$i');'
-done
-fi
-
-# Inputs
-if [ "$inputs" = "yes" ]; then
-cat <<EOF
-
-$Lc Inputs $Rc
-EOF
-
-N=`n2m 1 $Nu`
-for i in $N; do
-    echo '  mttu'$i' = mttu('$i');'
-done
-fi
-
 fi