[Mtt-checkins] mttroot/mtt/bin/trans/m abg2cbg.m, 1.52, 1.53 alias_args.m, 1.8, 1.9 cbg2ese.m, 1.53, 1.54 cbg2fig.m, 1.17, 1.18 ibg2abg.m, 1.19, 1.20 mtt_alias.m, 1.1, 1.2 mtt_component_eqn.m, 1.7, 1.8 rbg2abg.m, 1.49, 1.50 str2ch.m, 1.3, 1.4 write_abg.m, 1.11, 1.12 write_cbg.m, 1.5, 1.6 write_ibg.m, 1.4, 1.5 write_matrix.m, 1.9, 1.10

[Geraint P. B. <ge...@us...>]

Update of /cvsroot/mtt/mttroot/mtt/bin/trans/m
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23180/m

Modified Files:
	abg2cbg.m alias_args.m cbg2ese.m cbg2fig.m ibg2abg.m 
	mtt_alias.m mtt_component_eqn.m rbg2abg.m str2ch.m write_abg.m 
	write_cbg.m write_ibg.m write_matrix.m 
Log Message:
Replaced deprecated functions from Octave 2.1 for Octave 3.0: is_struct -> isstruct, struct_contains -> isfield, struct_elements -> fieldnames, is_complex -> iscomplex, setstr -> char

Index: write_abg.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/write_abg.m,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** write_abg.m	12 Sep 2004 22:27:27 -0000	1.11
--- write_abg.m	2 Nov 2009 16:54:03 -0000	1.12
***************
*** 6,9 ****
--- 6,12 ----
  ## $Id$
  ## $Log$
+ ## Revision 1.12  2009/11/02 16:54:03  geraint
+ ## Replaced deprecated functions from Octave 2.1 for Octave 3.0: is_struct -> isstruct, struct_contains -> isfield, struct_elements -> fieldnames, is_complex -> iscomplex, setstr -> char
+ ##
  ## Revision 1.11  2004/09/12 22:27:27  geraint
  ## Appended 't' to fopen mode string to open in text mode.
***************
*** 181,185 ****
    fprintf(fid,"# A double underscore __ represents a comma \n");
    eval(["alias = ", system_name, "_alias;"]);
!   if is_struct(alias)
      for [val,key] = alias
        fprintf(fid,"%s.alias.%s = \"%s\";\n", system_name,key,val);
--- 184,188 ----
    fprintf(fid,"# A double underscore __ represents a comma \n");
    eval(["alias = ", system_name, "_alias;"]);
!   if isstruct(alias)
      for [val,key] = alias
        fprintf(fid,"%s.alias.%s = \"%s\";\n", system_name,key,val);
***************
*** 189,193 ****
    fprintf(fid,"\n# Interface Definition\n");
    eval(["icd = ",system_name, "_icd;"]);
!   if is_struct(icd)
      for [val,key] = icd
        fprintf(fid,"%s.icd.%s = \"%s\";\n",system_name,key,val);
--- 192,196 ----
    fprintf(fid,"\n# Interface Definition\n");
    eval(["icd = ",system_name, "_icd;"]);
!   if isstruct(icd)
      for [val,key] = icd
        fprintf(fid,"%s.icd.%s = \"%s\";\n",system_name,key,val);

Index: ibg2abg.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/ibg2abg.m,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ibg2abg.m	26 Jun 2009 01:09:25 -0000	1.19
--- ibg2abg.m	2 Nov 2009 16:54:03 -0000	1.20
***************
*** 88,92 ****
    if (isfield(objects, "comp"))
      for [comp, comp_name] = objects.comp
!       n = size(struct_elements(comp))(1) - 1;
        eval(sprintf("objects.comp.%s.n_bonds = %i;",
  		   comp_name, n));
--- 88,92 ----
    if (isfield(objects, "comp"))
      for [comp, comp_name] = objects.comp
!       n = size(fieldnames(comp))(1) - 1;
        eval(sprintf("objects.comp.%s.n_bonds = %i;",
  		   comp_name, n));
***************
*** 96,100 ****
    if (isfield(objects, "port"))
      for [port, port_name] = objects.port
!       n = size(struct_elements(port))(1) - 1;
        eval(sprintf("objects.port.%s.n_bonds = %i;",
  		   port_name, n));
--- 96,100 ----
    if (isfield(objects, "port"))
      for [port, port_name] = objects.port
!       n = size(fieldnames(port))(1) - 1;
        eval(sprintf("objects.port.%s.n_bonds = %i;",
  		   port_name, n));
***************
*** 339,344 ****
      
      ## check compatible sizes
!     head.n_subs = size(struct_elements(head_bond))(1) - 2;
!     tail.n_subs = size(struct_elements(tail_bond))(1) - 2;
      if (head.n_subs != tail.n_subs)
        mtt_error(sprintf("Vector ports '%s' (%s:%s) and '%s' (%s:%s) are not compatible",
--- 339,344 ----
      
      ## check compatible sizes
!     head.n_subs = size(fieldnames(head_bond))(1) - 2;
!     tail.n_subs = size(fieldnames(tail_bond))(1) - 2;
      if (head.n_subs != tail.n_subs)
        mtt_error(sprintf("Vector ports '%s' (%s:%s) and '%s' (%s:%s) are not compatible",
***************
*** 418,422 ****
    ## count number of components
    if (isfield(objects, "comp"))
!     n_comps = size(struct_elements(objects.comp), 1)
    else
      n_comps = 0;
--- 418,422 ----
    ## count number of components
    if (isfield(objects, "comp"))
!     n_comps = size(fieldnames(objects.comp), 1)
    else
      n_comps = 0;
***************
*** 425,429 ****
    ## count number of internal ports
    if (isfield(objects, "port"))
!     n_ports = size(struct_elements(objects.port), 1)
    else
      n_ports = 0;
--- 425,429 ----
    ## count number of internal ports
    if (isfield(objects, "port"))
!     n_ports = size(fieldnames(objects.port), 1)
    else
      n_ports = 0;
***************
*** 484,488 ****
    
    if (isfield(objects, "comp"))
!     n_comps = size(struct_elements(objects.comp))(1);
    else
      n_comps = 0;
--- 484,488 ----
    
    if (isfield(objects, "comp"))
!     n_comps = size(fieldnames(objects.comp))(1);
    else
      n_comps = 0;

Index: str2ch.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/str2ch.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** str2ch.m	4 Dec 1996 21:39:55 -0000	1.3
--- str2ch.m	2 Nov 2009 16:54:03 -0000	1.4
***************
*** 16,19 ****
--- 16,22 ----
  % %% $Id$
  % %% $Log$
+ % %% Revision 1.4  2009/11/02 16:54:03  geraint
+ % %% Replaced deprecated functions from Octave 2.1 for Octave 3.0: is_struct -> isstruct, struct_contains -> isfield, struct_elements -> fieldnames, is_complex -> iscomplex, setstr -> char
+ % %%
  % %% Revision 1.3  1996/12/04 21:39:55  peterg
  % %% Changed to handle null string (octave returns lenghth of 1)
***************
*** 27,31 ****
  astr = abs(str);
  if (n>0) &  (n<=length(str)) & (strcmp(str,'')==0)
!   ch = setstr(astr(n));
  else
    ch = '';
--- 30,34 ----
  astr = abs(str);
  if (n>0) &  (n<=length(str)) & (strcmp(str,'')==0)
!   ch = char(astr(n));
  else
    ch = '';

Index: mtt_alias.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/mtt_alias.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mtt_alias.m	24 Mar 2003 12:31:19 -0000	1.1
--- mtt_alias.m	2 Nov 2009 16:54:03 -0000	1.2
***************
*** 29,33 ****
    ## Argument aliasing
    message = sprintf("\tfor component  %s within %s",name,Name);
!   if struct_contains(cbg,"alias")
      args = alias_args(args,cbg.alias,";",message,filenum,fullname);
    endif;
--- 29,33 ----
    ## Argument aliasing
    message = sprintf("\tfor component  %s within %s",name,Name);
!   if isfield(cbg,"alias")
      args = alias_args(args,cbg.alias,";",message,filenum,fullname);
    endif;

Index: abg2cbg.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/abg2cbg.m,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** abg2cbg.m	7 Sep 2004 18:22:53 -0000	1.52
--- abg2cbg.m	2 Nov 2009 16:54:03 -0000	1.53
***************
*** 21,24 ****
--- 21,27 ----
    ## ## $Id$
    ## ## $Log$
+   ## ## Revision 1.53  2009/11/02 16:54:03  geraint
+   ## ## Replaced deprecated functions from Octave 2.1 for Octave 3.0: is_struct -> isstruct, struct_contains -> isfield, struct_elements -> fieldnames, is_complex -> iscomplex, setstr -> char
+   ## ##
    ## ## Revision 1.52  2004/09/07 18:22:53  geraint
    ## ## Issues a more helpful error message than the cryptic Octave stuff
***************
*** 265,276 ****
    ##eval(["[bonds,components,n_ports,N_ports]=", fun_name, ";"]);
    eval(["[ABG]=", fun_name, ";"]);
!   !struct_contains(ABG,"subsystems")
!   if !struct_contains(ABG,"subsystems")# Are there any subsystems?
      return;			# Nothing to do
    else
!     [n_subsystems,junk] = size(struct_elements(ABG.subsystems))
    endif
    
!   if struct_contains(ABG,"portlist")# Are there any ports?
      [n_ports,junk] = size(ABG.portlist);
      ##     port_bond_index=zeros(n_ports,1);
--- 268,279 ----
    ##eval(["[bonds,components,n_ports,N_ports]=", fun_name, ";"]);
    eval(["[ABG]=", fun_name, ";"]);
!   !isfield(ABG,"subsystems")
!   if !isfield(ABG,"subsystems")# Are there any subsystems?
      return;			# Nothing to do
    else
!     [n_subsystems,junk] = size(fieldnames(ABG.subsystems))
    endif
    
!   if isfield(ABG,"portlist")# Are there any ports?
      [n_ports,junk] = size(ABG.portlist);
      ##     port_bond_index=zeros(n_ports,1);
***************
*** 373,377 ****
    for i=1:2
      field=deblank(fields(i,:));
!     if struct_contains(ABG,field);
        eval(["ABG_field = ABG.",field, ";"]);
        field,ABG_field
--- 376,380 ----
    for i=1:2
      field=deblank(fields(i,:));
!     if isfield(ABG,field);
        eval(["ABG_field = ABG.",field, ";"]);
        field,ABG_field
***************
*** 493,497 ****
        endwhile			# ( ci_index>0)
        eval(["ABG.",field," = ABG_field;"]); # Copy back to actual structure
!     endif			# struct_contains(CBG,field(i,:));
    endfor
    ##  if n_ports>0
--- 496,500 ----
        endwhile			# ( ci_index>0)
        eval(["ABG.",field," = ABG_field;"]); # Copy back to actual structure
!     endif			# isfield(CBG,field(i,:));
    endfor
    ##  if n_ports>0

Index: mtt_component_eqn.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/mtt_component_eqn.m,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mtt_component_eqn.m	25 Mar 2003 10:28:04 -0000	1.7
--- mtt_component_eqn.m	2 Nov 2009 16:54:03 -0000	1.8
***************
*** 43,47 ****
    if length(Name)>0
      cbg = mtt_cbg(Name);		# Structure for this subsystem
!     if struct_contains (cbg, "ports")
        ## Combine ports with the other subsystems
        for [component_structure, component] = cbg.ports
--- 43,47 ----
    if length(Name)>0
      cbg = mtt_cbg(Name);		# Structure for this subsystem
!     if isfield (cbg, "ports")
        ## Combine ports with the other subsystems
        for [component_structure, component] = cbg.ports
***************
*** 62,66 ****
      eval(sprintf("cbg.subsystems.%s.cr=CR;", name)); # and copy
    else			  # Call to a subsystem (represented by name="")
!     if !struct_contains(cbg,"portlist")
        N_ports = 0;
      else
--- 62,66 ----
      eval(sprintf("cbg.subsystems.%s.cr=CR;", name)); # and copy
    else			  # Call to a subsystem (represented by name="")
!     if !isfield(cbg,"portlist")
        N_ports = 0;
      else
***************
*** 166,171 ****
    ## Is the signal the output of a port?
    is_port_output = 0;			# Default
!   if struct_contains (cbg, "ports")
!     if struct_contains (cbg.ports,name)
        is_port_output = (outsig(2)!=insigs(1,2));
      endif
--- 166,171 ----
    ## Is the signal the output of a port?
    is_port_output = 0;			# Default
!   if isfield (cbg, "ports")
!     if isfield (cbg.ports,name)
        is_port_output = (outsig(2)!=insigs(1,2));
      endif

Index: write_cbg.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/write_cbg.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** write_cbg.m	12 Sep 2004 22:27:27 -0000	1.5
--- write_cbg.m	2 Nov 2009 16:54:03 -0000	1.6
***************
*** 6,9 ****
--- 6,12 ----
  ## $Id$
  ## $Log$
+ ## Revision 1.6  2009/11/02 16:54:03  geraint
+ ## Replaced deprecated functions from Octave 2.1 for Octave 3.0: is_struct -> isstruct, struct_contains -> isfield, struct_elements -> fieldnames, is_complex -> iscomplex, setstr -> char
+ ##
  ## Revision 1.5  2004/09/12 22:27:27  geraint
  ## Appended 't' to fopen mode string to open in text mode.
***************
*** 40,49 ****
  
    fprintf(fid,"\n# Status information\n");
! #  if struct_contains(system,"ports")
  #    for [port,name]=system.ports
  #      fprintf(fid,StatusFormat,system_name,"ports",name,port.status);
  #    endfor;
  #  endif
!   if struct_contains(system,"subsystems")
      for [subsystem,name]=system.subsystems
        fprintf(fid,StatusFormat,system_name,"subsystems",name,subsystem.status);
--- 43,52 ----
  
    fprintf(fid,"\n# Status information\n");
! #  if isfield(system,"ports")
  #    for [port,name]=system.ports
  #      fprintf(fid,StatusFormat,system_name,"ports",name,port.status);
  #    endfor;
  #  endif
!   if isfield(system,"subsystems")
      for [subsystem,name]=system.subsystems
        fprintf(fid,StatusFormat,system_name,"subsystems",name,subsystem.status);

Index: cbg2ese.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/cbg2ese.m,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** cbg2ese.m	21 Mar 2005 11:09:47 -0000	1.53
--- cbg2ese.m	2 Nov 2009 16:54:03 -0000	1.54
***************
*** 24,27 ****
--- 24,30 ----
    ## ## $Id$
    ## ## $Log$
+   ## ## Revision 1.54  2009/11/02 16:54:03  geraint
+   ## ## Replaced deprecated functions from Octave 2.1 for Octave 3.0: is_struct -> isstruct, struct_contains -> isfield, struct_elements -> fieldnames, is_complex -> iscomplex, setstr -> char
+   ## ##
    ## ## Revision 1.53  2005/03/21 11:09:47  gawthrop
    ## ## Now handles bicausal SS component -
***************
*** 315,319 ****
      field=deblank(fields(i,:));
      list=deblank(lists(i,:));
!     if struct_contains(CBG,list);
        eval(["namelist=CBG.",list,";"]); # List of ports/subsystems
        [N,M]=size(namelist);	# Number of ports/subsystems
--- 318,322 ----
      field=deblank(fields(i,:));
      list=deblank(lists(i,:));
!     if isfield(CBG,list);
        eval(["namelist=CBG.",list,";"]); # List of ports/subsystems
        [N,M]=size(namelist);	# Number of ports/subsystems
***************
*** 332,336 ****
      	  message = sprintf("\tfor component  %s (%s) within %s",\
  			    comp_name,subsystem.type,full_name);    
!     	  if struct_contains(CBG,"alias")
  	    subsystem.arg = alias_args(subsystem.arg,CBG.alias,";",message,infofilenum,full_name);
      	  endif;
--- 335,339 ----
      	  message = sprintf("\tfor component  %s (%s) within %s",\
  			    comp_name,subsystem.type,full_name);    
!     	  if isfield(CBG,"alias")
  	    subsystem.arg = alias_args(subsystem.arg,CBG.alias,";",message,infofilenum,full_name);
      	  endif;
***************
*** 340,344 ****
      	  message = sprintf("\tfor component  %s (%s) within %s",\
  			    comp_name,subsystem.type,full_name);    
!     	  if struct_contains(CBG,"alias")
  	    subsystem.cr = alias_args(subsystem.cr,CBG.alias,";",message,infofilenum,full_name);
      	  endif;
--- 343,347 ----
      	  message = sprintf("\tfor component  %s (%s) within %s",\
  			    comp_name,subsystem.type,full_name);    
!     	  if isfield(CBG,"alias")
  	    subsystem.cr = alias_args(subsystem.cr,CBG.alias,";",message,infofilenum,full_name);
      	  endif;
***************
*** 445,449 ****
  #               eval(sprintf("this_port = subABG.ports.%s;", \
  # 			   this_port_name));
! # 	      if struct_contains(this_port,"units")
  #                 eval(["effort_unit = \
  # 		    subABG.ports.",this_port_name,".units.effort;"]);
--- 448,452 ----
  #               eval(sprintf("this_port = subABG.ports.%s;", \
  # 			   this_port_name));
! # 	      if isfield(this_port,"units")
  #                 eval(["effort_unit = \
  # 		    subABG.ports.",this_port_name,".units.effort;"]);
***************
*** 575,585 ****
  
  	## component interface definition
! 	if struct_contains(CBG,"icd")
! 	  if struct_contains(CBG.icd,comp_name)
  	    if AliasingArguments
  	      subsystem.icd = alias_args(eval(["CBG.icd.",comp_name]),CBG.alias,";",message,infofilenum,full_name);
  	    endif
  	  endif
! 	  if (struct_contains(subsystem,"icd"))
  	    subsystem.icd = subs_arg(subsystem.icd,system_args, ...
  				     "null",full_name,subsystem.type,comp_name,infofilenum);
--- 578,588 ----
  
  	## component interface definition
! 	if isfield(CBG,"icd")
! 	  if isfield(CBG.icd,comp_name)
  	    if AliasingArguments
  	      subsystem.icd = alias_args(eval(["CBG.icd.",comp_name]),CBG.alias,";",message,infofilenum,full_name);
  	    endif
  	  endif
! 	  if (isfield(subsystem,"icd"))
  	    subsystem.icd = subs_arg(subsystem.icd,system_args, ...
  				     "null",full_name,subsystem.type,comp_name,infofilenum);
***************
*** 600,604 ****
  
        endfor			# [subsystem,comp_name] = CBG_field
!     endif			# struct_contains(CBG,field)
    endfor			# i=1:2
  
--- 603,607 ----
  
        endfor			# [subsystem,comp_name] = CBG_field
!     endif			# isfield(CBG,field)
    endfor			# i=1:2
  

Index: cbg2fig.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/cbg2fig.m,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** cbg2fig.m	12 Sep 2004 22:27:27 -0000	1.17
--- cbg2fig.m	2 Nov 2009 16:54:03 -0000	1.18
***************
*** 25,28 ****
--- 25,31 ----
    ## %% $Id$
    ## %% $Log$
+   ## %% Revision 1.18  2009/11/02 16:54:03  geraint
+   ## %% Replaced deprecated functions from Octave 2.1 for Octave 3.0: is_struct -> isstruct, struct_contains -> isfield, struct_elements -> fieldnames, is_complex -> iscomplex, setstr -> char
+   ## %%
    ## %% Revision 1.17  2004/09/12 22:27:27  geraint
    ## %% Appended 't' to fopen mode string to open in text mode.
***************
*** 112,116 ****
  
    ## Create a back slash '\' character.
!   bs = setstr(92);
  
    ## Create the (full) system name
--- 115,119 ----
  
    ## Create a back slash '\' character.
!   bs = char(92);
  
    ## Create the (full) system name
***************
*** 158,162 ****
  						     # components
  
!   if struct_contains(CBG,'portlist')
      [N_ports, Columns] = size(CBG.portlist);
    else
--- 161,165 ----
  						     # components
  
!   if isfield(CBG,'portlist')
      [N_ports, Columns] = size(CBG.portlist);
    else

Index: write_matrix.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/write_matrix.m,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** write_matrix.m	27 Sep 2006 13:55:08 -0000	1.9
--- write_matrix.m	2 Nov 2009 16:54:03 -0000	1.10
***************
*** 8,11 ****
--- 8,14 ----
  % %% $Id$
  % %% $Log$
+ % %% Revision 1.10  2009/11/02 16:54:03  geraint
+ % %% Replaced deprecated functions from Octave 2.1 for Octave 3.0: is_struct -> isstruct, struct_contains -> isfield, struct_elements -> fieldnames, is_complex -> iscomplex, setstr -> char
+ % %%
  % %% Revision 1.9  2006/09/27 13:55:08  geraint
  % %% Write complex numbers in polar form instead of real and imaginary parts.
***************
*** 56,60 ****
    for col = 1:M
      value = matrix(row,col);
!     if is_complex(value)
  	fprintf(filenum, '%g*e^(%g*i)', abs(value),angle(value));
      else
--- 59,63 ----
    for col = 1:M
      value = matrix(row,col);
!     if iscomplex(value)
  	fprintf(filenum, '%g*e^(%g*i)', abs(value),angle(value));
      else

Index: write_ibg.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/write_ibg.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** write_ibg.m	12 Sep 2004 22:27:27 -0000	1.4
--- write_ibg.m	2 Nov 2009 16:54:03 -0000	1.5
***************
*** 4,8 ****
    
    fid = fopen([system_name,"_ibg.m"], "wt");
!   [nbonds, junk] = size(struct_elements(bonds));
    format_hc = "  %s.bonds.bond%i.head.component\t= \"%s\";\n";
    format_tc = "  %s.bonds.bond%i.tail.component\t= \"%s\";\n";
--- 4,8 ----
    
    fid = fopen([system_name,"_ibg.m"], "wt");
!   [nbonds, junk] = size(fieldnames(bonds));
    format_hc = "  %s.bonds.bond%i.head.component\t= \"%s\";\n";
    format_tc = "  %s.bonds.bond%i.tail.component\t= \"%s\";\n";

Index: rbg2abg.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/rbg2abg.m,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** rbg2abg.m	22 Jul 2004 13:18:02 -0000	1.49
--- rbg2abg.m	2 Nov 2009 16:54:03 -0000	1.50
***************
*** 8,11 ****
--- 8,14 ----
    ## ## $Id$
    ## ## $Log$
+   ## ## Revision 1.50  2009/11/02 16:54:03  geraint
+   ## ## Replaced deprecated functions from Octave 2.1 for Octave 3.0: is_struct -> isstruct, struct_contains -> isfield, struct_elements -> fieldnames, is_complex -> iscomplex, setstr -> char
+   ## ##
    ## ## Revision 1.49  2004/07/22 13:18:02  geraint
    ## ## Minor typo in error message.
***************
*** 383,388 ****
  	## Replace by alias -- if any
      	eval( ["alias = ", comp_type, '_alias';]); # Get aliases
!     	if is_struct(alias)		# are there any aliases
!           if struct_contains(alias,port_name_i) # Is this an alias?
  	    eval(["new_port_name_i = alias.",port_name_i]);
  	    mtt_info(["Aliasing name [" port_name_i "]\t on component " \
--- 386,391 ----
  	## Replace by alias -- if any
      	eval( ["alias = ", comp_type, '_alias';]); # Get aliases
!     	if isstruct(alias)		# are there any aliases
!           if isfield(alias,port_name_i) # Is this an alias?
  	    eval(["new_port_name_i = alias.",port_name_i]);
  	    mtt_info(["Aliasing name [" port_name_i "]\t on component " \
***************
*** 575,579 ****
      if exist([comp_type, '_cause'])==0
        eval(["ABG = ",comp_type, "_abg;"]);
!       if struct_contains (ABG, "portlist")
  	port_list = ABG.portlist;
        else
--- 578,582 ----
      if exist([comp_type, '_cause'])==0
        eval(["ABG = ",comp_type, "_abg;"]);
!       if isfield (ABG, "portlist")
  	port_list = ABG.portlist;
        else

Index: alias_args.m
===================================================================
RCS file: /cvsroot/mtt/mttroot/mtt/bin/trans/m/alias_args.m,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** alias_args.m	13 Jun 2001 16:07:15 -0000	1.8
--- alias_args.m	2 Nov 2009 16:54:03 -0000	1.9
***************
*** 6,9 ****
--- 6,12 ----
  ## $Id$
  ## $Log$
+ ## Revision 1.9  2009/11/02 16:54:03  geraint
+ ## Replaced deprecated functions from Octave 2.1 for Octave 3.0: is_struct -> isstruct, struct_contains -> isfield, struct_elements -> fieldnames, is_complex -> iscomplex, setstr -> char
+ ##
  ## Revision 1.8  2001/06/13 16:07:15  gawthrop
  ## Fixed bug with three separators in a row eg )/(
***************
*** 36,40 ****
  ###############################################################
  
!   if is_struct(alias)
      if !isempty(args)
        Args = split(args,delim); args="";
--- 39,43 ----
  ###############################################################
  
!   if isstruct(alias)
      if !isempty(args)
        Args = split(args,delim); args="";
***************
*** 43,47 ****
          arg = deblank(Args(i,:));
          arg_ = strrep(arg,",","__");
!         if struct_contains(alias,arg_)
            eval(["new_arg = alias.", arg_,";"]);
    	  mtt_info(["Replacing ", arg, "\t by ",\
--- 46,50 ----
          arg = deblank(Args(i,:));
          arg_ = strrep(arg,",","__");
!         if isfield(alias,arg_)
            eval(["new_arg = alias.", arg_,";"]);
    	  mtt_info(["Replacing ", arg, "\t by ",\