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,15 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.15 1997/08/06 21:43:19 peterg +% %% Corrected error in creating component list: the kth component of the +% %% list is given by the jth component of the original list NOT vice +% %% versa. +% %% % %% Revision 1.14 1997/08/04 14:18:55 peterg % %% If no ports labels at all, just use the default component list. % %% % %% Revision 1.13 1997/08/04 12:50:39 peterg % %% Many bug fixes to the named port version + tied up the logic and @@ -199,11 +204,11 @@ n_unsorted_ports = 0; end; % One port defaults: if (n_comp_ports==1)&(n_unsorted_ports==0) - if direction(1)<0 % Wrong way for default + if (direction(1)<0) & ~strcmp(comp_type,'SS') % Wrong way for default mtt_info(['One-port ', comp_name, ' (', comp_type, ') has the sign pointing the wrong way '], infofile); end; unsorted_port_list = port_list; end; @@ -224,11 +229,11 @@ if m_unsorted_ports<2 n_unsorted_ports = 0; end; % Junctions or no lables(order of ports unimportant) - if (comp_type=='zero')|(comp_type=='one') + if strcmp(comp_type,'zero')|strcmp(comp_type,'one') for j = 1:n_comp_ports components(i,j) = signed_bond_list(j); end else %Order of ports is important unsorted_port_list, port_list @@ -254,12 +259,10 @@ mtt_info(['Component ', comp_name, ' (', comp_type, ') has an unrecognised port: ', name_k], infofile); else components(i,k) = signed_bond_list(j); end; end; - disp(comp_name); - components(i,:),signed_bond_list end; end; end;