Overview
Comment: | Fixed bug passing causality from subsystems. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | origin/master | trunk |
Files: | files | file ages | folders |
SHA3-256: |
51c0f242ff376745f1aacbe50f20e1f1 |
User & Date: | gawthrop@users.sourceforge.net on 1996-08-05 18:53:21 |
Other Links: | branch diff | manifest | tags |
Context
1996-08-05
| ||
19:50:55 | Put in fig.fig target. check-in: b0b3314669 user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
18:53:21 | Fixed bug passing causality from subsystems. check-in: 51c0f242ff user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
18:44:56 | Now writes out a _cbg file without ----- symbol. check-in: ee2547fd0c user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
Changes
Modified mttroot/mtt/bin/trans/m/abg2cbg.m from [88d6038942] to [aa59dcdd82].
|
| | > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | function [port_bonds, status] = abg2cbg(system_name, ... system_type, full_name, ... port_bonds,infofile) % [bonds,status] = abg2cbg(system_name,infofile) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %%%%% Model Transformation Tools %%%%% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Matlab function abg2cbg.m % Acausal bond graph to causal bond graph: mfile format % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ % %% Revision 1.2 1996/08/05 15:41:41 peter % %% Now recursively does causality on subsystems. % %% % %% Revision 1.1 1996/08/04 17:55:55 peter % %% Initial revision % %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% pc = '%'; |
︙ | ︙ | |||
65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | [n_components,columns] = size(components); if n_components==0 % there is nothing to be done return end; % Find number of port bonds [n_port_bonds,columns] = size(port_bonds); if n_port_bonds~=n_ports mtt_info(sprintf('%1.0f port bonds incompatible with %1.0f ports', ... n_port_bonds, n_ports), infofile); else % Copy the port bonds for i = 1:n_ports bonds(i,:) = port_bonds(i,:); end; end; | > > < < < < | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | [n_components,columns] = size(components); if n_components==0 % there is nothing to be done return end; % Find number of port bonds [n_port_bonds,columns] = size(port_bonds); % Check compatibility - if ok copy port bonds to the internal bonds list. if n_port_bonds~=n_ports mtt_info(sprintf('%1.0f port bonds incompatible with %1.0f ports', ... n_port_bonds, n_ports), infofile); else % Copy the port bonds for i = 1:n_ports bonds(i,:) = port_bonds(i,:); end; end; % Set initial status status = -ones(n_components,1); total = 2*n_bonds; done = sum(sum(abs(bonds)))/total*100; % $$$ mtt_info(sprintf('Initial causality is %3.0f%s complete.', done, pc), infofile); |
︙ | ︙ | |||
106 107 108 109 110 111 112 | if strcmp(comp_type,'0') comp_type = 'zero'; end; if strcmp(comp_type,'1') comp_type = 'one'; end; | > > > > | > > | | | < > > > | | | | | | | > < | | | | | < < < < | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | if strcmp(comp_type,'0') comp_type = 'zero'; end; if strcmp(comp_type,'1') comp_type = 'one'; end; % $$$ name % $$$ comp_bonds % $$$ bond_list % Component cuasality procedure name cause_name = [comp_type, '_cause']; % Invoke the appropriate causality procedure if exist(cause_name)~=2 % Try a compound component disp('------------PUSH-----------------'); [comp_bonds,s] = abg2cbg(name, comp_type, full_name, comp_bonds, ... infofile); status(i)=max(abs(s)); disp('------------POP-----------------'); else % its a simple component eval([ '[comp_bonds,status(i)] = ', cause_name, '(comp_bonds);' ]); end; % Update the full bonds list % and convert from component orientated to arrow orientated causality bonds(bond_list,:) = comp_bonds.*direction; end; done = sum(sum(abs(bonds)))/total*100; % mtt_info(sprintf('Causality is %3.0f%s complete.', done, pc), infofile); end; final_done = (sum(status==zeros(n_components,1))/n_components)*100;; mtt_info(sprintf('Final causality is %3.0f%s complete.', final_done, pc), infofile); % List overcausal bonds [over_causal_bonds,n] = getindex(status,1); if n>0 for i=over_causal_bonds' eval([ '[comp_type,name] = ', system_type, '_cmp(i);' ]); mtt_info(sprintf('Component %s (%s) is overcausal', name, comp_type), ... infofile); end; end; % List undercausal bonds [under_causal_bonds,n] = getindex(status,-1); if n>0 for i=under_causal_bonds' eval([ '[comp_type,name] = ', system_type, '_cmp(i);' ]); mtt_info(sprintf('Component %s (%s) is undercausal', name, comp_type), ... infofile); end; end; full_name write_cbg(full_name,bonds,status); % Return the port bonds for i = 1:n_ports port_bonds(i,:) = bonds(i,:); end; disp('----------------------'); |