Index: mttroot/mtt/bin/trans/m/abg2cbg.m
==================================================================
--- mttroot/mtt/bin/trans/m/abg2cbg.m
+++ mttroot/mtt/bin/trans/m/abg2cbg.m
@@ -1,7 +1,9 @@
-function [bonds,status] = abg2cbg(system_name,bonds,infofile)
-% [bonds,status] = abg2cbg(system_name,bonds,infofile)
+function [bonds, status] = abg2cbg(system_name, ...
+    system_type, full_name, ...
+    port_bonds,infofile)
+% [bonds,status] = abg2cbg(system_name,infofile)
 % 
 %     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 %     %%%%% Model Transformation Tools %%%%%
 %     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % 
@@ -11,82 +13,126 @@
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % %% Version control history
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % %% $Id$
 % %% $Log$
+% %% Revision 1.1  1996/08/04 17:55:55  peter
+% %% Initial revision
+% %%
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 pc = '%';
-if nargin<3
+if nargin<1
+  system_name = 'no_name';
+end;
+
+if nargin<4
+  port_bonds = [];
+end;
+
+if nargin<5
   infofile = 'stdout';
 end;
 
-% Evaluate the system function to get the bonds
-fun_name = [system_name, '_abg']
+fun_name = [system_type, '_abg']
+
+% If no such function - then there is nothing to be done.
 if exist(fun_name)~=2
   mtt_info(['m-file ', fun_name, ' does not exist'], infofile);
   bonds = [];
   status = [];
+  return
+end;
+
+% Create the (full) system name
+if length(full_name)==0
+  full_name = system_name;
 else
-  eval(['[bonds,components]=', fun_name, ';']);
-
-  % Find number of bonds
-  [n_bonds,columns] = size(bonds);
-  if (columns ~= 2)&(n_bonds>0)
-    error('Incorrect bonds matrix: must have 2 columns');
-  end;
-
-  % Find number of components
-  [n_components,columns] = size(components);
-
-  % 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);
-
-  old_done = inf;
-
-  while done~=old_done
-    disp(sprintf('Causality is %3.0f%s complete.', done, pc));
-    old_done = done;
-
-    for i = 1:n_components
-      comp = nozeros(components(i,:));
-      bond_list = abs(comp);
-      direction = sign(comp)'*[1 1];
-      % Convert from arrow orientated to component orientated causality
-      comp_bonds = bonds(bond_list,:).*direction;
-      eval([ '[comp_type,name,cr,arg] = ', system_name, '_cmp(i);' ]);
-      % change name of 0 and 1 components -- matlab doesn't like numbers here
-      if strcmp(comp_type,'0')
-	comp_type = 'zero';
-      end;
-      if strcmp(comp_type,'1')
-	comp_type = 'one';
-      end;
-      
-      % Invoke  the appropriate causality procedure
-      cause_name = [comp_type, '_cause'];
-      if exist(cause_name)~=2 % Try a compound component -- need doing
-       mtt_info(sprintf('Component %s is unknown', comp_type), infofile);
-% $$$ 	sys_name = [comp_type, '_abg'];
-% $$$ 	agb2cbg(sys_name,comp_bonds,infofile);
-      else % its a simple component
-	cause_name
-	eval([ '[comp_bonds,status(i)] = ', cause_name, '(comp_bonds);' ]);
-        % Convert from component orientated to arrow orientated causality
-	bonds(bond_list,:) = comp_bonds.*direction; 
-      end;
-    end;
-
-    done = sum(sum(abs(bonds)))/total*100;
-%  mtt_info(sprintf('Causality is %3.0f%s complete.', done, pc), infofile);
-
-  end;
-end;
+  full_name = [full_name, '_', system_name];
+end;
+
+% Evaluate the system function to get the bonds
+eval(['[bonds,components,n_ports]=', fun_name, ';']);
+
+% Find number of bonds
+[n_bonds,columns] = size(bonds);
+if (columns ~= 2)&(n_bonds>0)
+  error('Incorrect bonds matrix: must have 2 columns');
+end;
+
+ 
+% Find number of components
+[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;
+
+bonds,port_bonds
+
+
+
+% 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);
+
+% Set the causality of the ports
+old_done = inf;
+
+while done~=old_done
+  disp(sprintf('Causality is %3.0f%s complete.', done, pc));
+  old_done = done;
+  
+  for i = 1:n_components
+    comp = nozeros(components(i,:));
+    bond_list = abs(comp);
+    direction = sign(comp)'*[1 1];
+    % Convert from arrow orientated to component orientated causality
+    comp_bonds = bonds(bond_list,:).*direction;
+    eval([ '[comp_type,name,cr,arg] = ', system_type, '_cmp(i);' ]);
+    % change name of 0 and 1 components -- matlab doesn't like numbers here
+    if strcmp(comp_type,'0')
+      comp_type = 'zero';
+    end;
+    if strcmp(comp_type,'1')
+      comp_type = 'one';
+    end;
+    
+    % Invoke  the appropriate causality procedure
+    cause_name = [comp_type, '_cause'];
+    if exist(cause_name)~=2 % Try a compound component
+      disp('------------PUSH-----------------');
+      [b,s] = abg2cbg(name, comp_type, full_name, comp_bonds, ...
+	  infofile)
+      status(i)=max(s);
+      disp('------------POP-----------------');
+    else % its a simple component
+      cause_name
+      eval([ '[comp_bonds,status(i)] = ', cause_name, '(comp_bonds);' ]);
+      % Convert from component orientated to arrow orientated causality
+      bonds(bond_list,:) = comp_bonds.*direction; 
+    end;
+  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);
@@ -93,33 +139,29 @@
 
 % List overcausal bonds
 [over_causal_bonds,n] = getindex(status,1)
 if n>0
   for i=over_causal_bonds'
-    eval([ '[comp_type,name] = ', system_name, '_cmp(i);' ]);
+    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_name, '_cmp(i);' ]);
+    eval([ '[comp_type,name] = ', system_type, '_cmp(i);' ]);
     mtt_info(sprintf('Component %s (%s) is undercausal', name, comp_type), ...
       infofile);
   end;
 end;
 
-
+write_cbg(full_name,bonds,status);
 
-
-
-
-
-
+disp('----------------------');