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 @@ -23,36 +23,36 @@ ## Is output same causality as junction? same_type = outsig(2)==i_jun_type; ## LHS - eqn = sprintf("%s(%i,%i) :=", Name, abs(outsig(1)), cause2index(outsig(2))); + eqn = sprintf("%s :=", varname(Name, abs(outsig(1)), outsig(2))); ## Find the input bond of the same causality as junction one = ones(N,1); inport = find(insigs(:,2)==i_jun_type*one); ##RHS if same_type insig = insigs(inport,:); inname = innames(inport,:); - eqn = sprintf("%s\n\t%s(%i,%i)", eqn, Name, abs(insigs(inport,1)),cause2index(i_jun_type)); + eqn = sprintf("%s\n\t%s", eqn, varname(Name, abs(insigs(inport,1)),i_jun_type)); else insig=[]; inname=""; inports = []; 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(%i,%i)", eqn, plusminus, Name, \ - abs(insigs(i,1)), cause2index(-i_jun_type)); + 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 endif eqn = sprintf("%s;", eqn); insigs = insig; innames = inname; endfunction