Index: mttroot/mtt/lib/comp/simple/CI_seqn.m ================================================================== --- mttroot/mtt/lib/comp/simple/CI_seqn.m +++ mttroot/mtt/lib/comp/simple/CI_seqn.m @@ -10,11 +10,11 @@ state_index=3; i_cause = outsig(2); # Extract causality - state_equation=((i_cause==1)&&strcmp(comp_type,"C"))\ + state_equation=((i_cause==1)&&strcmp(comp_type,"C")) ... ||((i_cause==-1)&&strcmp(comp_type,"I")); ## Create the equation if state_equation # output/state LHS = varname(Name, outsig(1,1), state_index); @@ -21,11 +21,11 @@ RHS = sprintf("MTTx_%s%s%s", Name, delim, name); eqn_1 = sprintf("%s := %s;", LHS, RHS); inports = [1:N]; comp_type_str=sprintf("""%s""", comp_type); - eqn_2 = equation(comp_type_str,Name,cr,arg,outsig(1),outsig(2),outsig(3),\ + eqn_2 = equation(comp_type_str,Name,cr,arg,outsig(1),outsig(2),outsig(3), ... insigs(:,1),state_index,inports); eqn = sprintf("%s\n%s", eqn_1, eqn_2); else # state derivative RHS = varname(Name, insigs(1,1), insigs(1,2)); Index: mttroot/mtt/lib/comp/simple/C_eqn.m ================================================================== --- mttroot/mtt/lib/comp/simple/C_eqn.m +++ mttroot/mtt/lib/comp/simple/C_eqn.m @@ -13,10 +13,13 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ +% %% Revision 1.3 2003/01/07 10:10:14 gawthrop +% %% Uses new version of equation.m - passes component type to cr. +% %% % %% Revision 1.2 1997/04/09 13:00:28 peterg % %% *** empty log message *** % %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -28,14 +31,14 @@ eqnfile = 'stdout'; end; % Unicausal version CorI = 1; -structure = cieqn(name,bond_number,bonds,direction,cr,args, structure, \ +structure = cieqn(name,bond_number,bonds,direction,cr,args, structure, ... CorI, eqnfile); Index: mttroot/mtt/lib/comp/simple/SS_seqn.m ================================================================== --- mttroot/mtt/lib/comp/simple/SS_seqn.m +++ mttroot/mtt/lib/comp/simple/SS_seqn.m @@ -1,6 +1,6 @@ -function [eqn,insigs,innames] = SS_seqn (Name, name, cr, arg, outsig, \ +function [eqn,insigs,innames] = SS_seqn (Name, name, cr, arg, outsig, ... insigs,innames,is_port) ## usage: [eqn,inbonds] = SS_seqn (Name, cr, arg, outbond, inbonds) ## ## Index: mttroot/mtt/lib/comp/simple/Sensor_seqn.m ================================================================== --- mttroot/mtt/lib/comp/simple/Sensor_seqn.m +++ mttroot/mtt/lib/comp/simple/Sensor_seqn.m @@ -8,9 +8,9 @@ if strcmp(attribute,"external") LHS = sprintf("MTTy_%s", name); elseif strcmp(attribute,"internal") LHS = sprintf("MTTy_%s", name); else - error(sprintf("attribute ""%s"" not appropriate for a \ - source"), attribute); + error(sprintf("attribute ""%s"" not appropriate for a " ... + "source"), attribute); endif endfunction Index: mttroot/mtt/lib/comp/simple/Source_seqn.m ================================================================== --- mttroot/mtt/lib/comp/simple/Source_seqn.m +++ mttroot/mtt/lib/comp/simple/Source_seqn.m @@ -5,12 +5,12 @@ ## Write the RHS of a source equation if strcmp(attribute,"external") RHS = sprintf("MTTu_%s",name); elseif strcmp(attribute,"internal") - error(sprintf("attribute ""internal"" not appropriate for a \ - source")); + error(sprintf("attribute ""internal"" not appropriate for a " + "source")); else RHS = attribute; endif endfunction Index: mttroot/mtt/lib/comp/simple/junction_seqn.m ================================================================== --- mttroot/mtt/lib/comp/simple/junction_seqn.m +++ mttroot/mtt/lib/comp/simple/junction_seqn.m @@ -1,8 +1,8 @@ -function [eqn,insigs,innames] = junction_seqn (jun_type,Name, outsig, \ +function [eqn,insigs,innames] = junction_seqn (jun_type,Name, outsig, ... insigs, innames) - ## usage: [eqn,insigs] = junction_seqn (jun_type,Name, outport, outsig, \ + ## usage: [eqn,insigs] = junction_seqn (jun_type,Name, outport, outsig, ... ## insigs) ## ## ## Junctions @@ -43,11 +43,11 @@ out_dir = sign(insigs(inport,1)); for i=1:N if i!=inport in_dir = sign(insigs(i,1)); plusminus = sign2name(-in_dir*out_dir); - eqn = sprintf("%s\n\t%s%s", eqn, plusminus, varname(Name, \ + eqn = sprintf("%s\n\t%s%s", eqn, plusminus, varname(Name, ... abs(insigs(i,1)), -i_jun_type)); insig = [insig; insigs(i,:)]; inname = [inname; innames(i,:)]; endif endfor