Index: mttroot/mtt/bin/trans/m/rbg2abg.m ================================================================== --- mttroot/mtt/bin/trans/m/rbg2abg.m +++ mttroot/mtt/bin/trans/m/rbg2abg.m @@ -3,10 +3,13 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.27 1998/07/02 12:24:02 peterg +% %% Expand port aliases +% %% % %% Revision 1.26 1998/04/16 14:07:51 peterg % %% Sorted out [] problem with vector ports -- new octave function % %% split_port % %% % %% Revision 1.25 1998/04/12 15:01:04 peterg @@ -98,11 +101,10 @@ % %% % %% Revision 1.1 1996/08/04 18:30:14 peter % %% Initial revision % %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - if nargin<7 infofile='stdout'; else fnum = fopen(infofile, 'w'); @@ -205,19 +207,18 @@ % which end of bond at component? bond_end = index(:,2); direction = -sign(bond_end-1.5*one); - signed_bond_list = bond_list.*direction + signed_bond_list = bond_list.*direction; components = add_bond(components,signed_bond_list',i); - % Unalias all the ports on this component - if not a junction if ((comp_type!="0")&&(comp_type!="1")) - eval( ["alias = ", comp_type, '_alias']); # Get aliases + eval( ["alias = ", comp_type, '_alias';]); # Get aliases if is_struct(alias) # are there any aliases for j=1:n_comp_bonds - port_name_index = getindex(port_bond,signed_bond_list(j)) + port_name_index = getindex(port_bond,signed_bond_list(j)); if port_name_index>0 # There is a port on this bond port_name_i = deblank(port_name(port_name_index,:)); port_name_i = port_name_i(2:length(port_name_i)-1) # strip [] if struct_contains(alias,port_name_i) # Is this an alias? eval(["new_port_name_i = alias.",port_name_i]);