Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/charisee_dev/src/compiler/ein/printer.sml
ViewVC logotype

Diff of /branches/charisee_dev/src/compiler/ein/printer.sml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

branches/charisee/src/compiler/ein/printer.sml revision 3017, Mon Mar 9 15:52:22 2015 UTC branches/charisee_dev/src/compiler/ein/printer.sml revision 3324, Tue Oct 20 05:22:52 2015 UTC
# Line 17  Line 17 
17      fun handleBeta(a,b)=String.concat["δ_(",handleIndex a, ",", handleIndex b,")"]      fun handleBeta(a,b)=String.concat["δ_(",handleIndex a, ",", handleIndex b,")"]
18      fun handleSumRange (mu,lb,ub)= String.concat[(handleIndex mu),"[",iTos(lb),"-",iTos(ub),"]"]      fun handleSumRange (mu,lb,ub)= String.concat[(handleIndex mu),"[",iTos(lb),"-",iTos(ub),"]"]
19    
20      (*printbody:ein_exp ->string*)  
21      fun printbody term = (case term      fun printbody term = (case term
22          of E.Const r => iTos(r)          of E.Const r => iTos(r)
23          | E.ConstR r =>RationalEin.toString r          | E.ConstR r =>RationalEin.toString r
# Line 25  Line 25 
25          | E.Tensor(id, alpha) =>String.concat[" T",iTos(id),"_",handleAlpha alpha]          | E.Tensor(id, alpha) =>String.concat[" T",iTos(id),"_",handleAlpha alpha]
26          | E.Field(id, []) =>String.concat[" F",iTos(id)]          | E.Field(id, []) =>String.concat[" F",iTos(id)]
27          | E.Field(id, alpha) =>String.concat[" F",iTos(id),"_",handleAlpha alpha]          | E.Field(id, alpha) =>String.concat[" F",iTos(id),"_",handleAlpha alpha]
28          | E.Krn(tid,[],pos) =>String.concat[" H ",iTos(tid),"[",  (printbody pos),"]"]          | E.Krn(tid,[],pos) =>String.concat[" H ",iTos(tid)(*,"[",  (printbody pos),"]"*)]
29          | E.Krn(tid,betas,pos) => String.concat[" H",iTos(tid),"^{", String.concat (List.map handleBeta betas),"} [",(printbody pos),"]"]          | E.Krn(tid,betas,pos) => String.concat[" H",iTos(tid),"^{", String.concat (List.map handleBeta betas)(*,"} [",(printbody pos),"]"*)]
30          | E.Delta(ix) =>  handleBeta ix          | E.Delta(ix) =>  handleBeta ix
31          | E.Value(ix)=> String.concat["_",iTos(ix),"_"]          | E.Value(ix)=> String.concat["_",iTos(ix),"_"]
32          | E.Epsilon(ix, jx, kx) => String.concat["ϵ_",iTos(ix), iTos(jx), iTos(kx)]          | E.Epsilon(ix, jx, kx) => String.concat["ϵ_",iTos(ix), iTos(jx), iTos(kx)]
33          | E.Eps2(ix, jx) => String.concat["ϵ_",iTos(ix), iTos(jx)]          | E.Eps2(ix, jx) => String.concat["ϵ_",iTos(ix), iTos(jx)]
34          | E.Sum ([(v,_,_)],e1)=>String.concat[" Σ_",handleIndex v,"⋐" ,printbody e1,"⋑",handleIndex v]          | E.Sum ([(v,_,_)],e1)=>String.concat[" Σ_",handleIndex v,"⋐" ,printbody e1,"⋑",handleIndex v]
   
35          | E.Sum (sumindex,e1)=>String.concat[" Σ_",String.concatWith ","(List.map handleSumRange sumindex),"⋐" ,printbody e1,"⋑"]          | E.Sum (sumindex,e1)=>String.concat[" Σ_",String.concatWith ","(List.map handleSumRange sumindex),"⋐" ,printbody e1,"⋑"]
36          | E.Neg e1 => String.concat["-NEG-", printbody e1]          | E.Neg e1 => String.concat["-NEG-", printbody e1]
37          | E.Lift e1 => String.concat["LIFT ⊢", printbody e1,"⊣"]          | E.Lift e1 => String.concat["LIFT ⊢", printbody e1,"⊣"]
38          | E.Add el => String.concat["(",String.concatWith "+" (List.map printbody el),")"]          | E.Add el => String.concat["(",String.concatWith "+" (List.map printbody el),")"]
39          | E.Sub(e1, e2) => String.concat ["(",printbody(e1),"---- ",printbody(e2)]          | E.Sub(e1, e2) => String.concat ["(",printbody(e1),"---- ",printbody(e2)]
40          | E.Prod el => String.concat["(",String.concatWith "* " (List.map printbody el),")"]   | E.Prod el => String.concat["{*{",String.concatWith "* " (List.map printbody el),"}*}"]
41          | E.Div(e1,e2) => String.concat ["(",printbody(e1),")/( ",printbody (e2),")"]          | E.Div(e1,e2) => String.concat ["(",printbody(e1),")/( ",printbody (e2),")"]
42          | E.Partial alpha => String.concat["d/dx_",handleAlpha alpha]          | E.Partial alpha => String.concat["d/dx_",handleAlpha alpha]
43          | E.Apply(e1, e2)=> String.concat [ printbody(e1),"@{", printbody(e2),"} "]          | E.Apply(e1, e2)=> String.concat [ printbody(e1),"@{", printbody(e2),"} "]
44   (*   (*
45          | E.Conv(fid,alpha, tid ,[])=> String.concat["|v",iTos(fid),"_{",handleAlpha alpha, "}★h",iTos(tid),"|"]          | E.Conv(fid,alpha, tid ,[])=> String.concat["|v",iTos(fid),"_{",handleAlpha alpha, "}★h(",iTos(tid),")|"]
46          | E.Conv(fid,alpha, tid, beta)=> String.concat["|v",iTos(fid),"_{",handleAlpha alpha, "}★d/dx_{",handleAlpha beta,"}h",iTos(tid),"|"]                  | E.Conv(fid,alpha, tid, [b0,b1])=> String.concat["|v",iTos(fid),"_{",handleAlpha alpha, "}★h2(",iTos(tid),")dx_",handleAlpha [b0,b1],"}|"]
47            | E.Conv(fid,alpha, tid, beta)=> String.concat["|v",iTos(fid),"_{",handleAlpha alpha, "}★h(",iTos(tid),")dx_",handleAlpha beta,"}|"]
48  *)  *)
49          | E.Conv(fid,alpha, tid, beta)=> String.concat["F_",handleAlpha alpha, "★",handleAlpha beta]           | E.Conv(fid,alpha, tid,[])=> String.concat["F_",handleAlpha alpha]
50         (* | E.Conv _ =>String.concat["G"]*)           | E.Conv(fid,alpha, tid, beta)=> String.concat["F_",handleAlpha alpha,"∇",handleAlpha beta]
51          | E.Probe(e1,_)=>printbody(e1)          | E.Probe (e1,e2)=> String.concat [printbody(e1)(*,"[", printbody(e2),"]"*)]
52         (* | E.Probe (e1,e2)=> String.concat ["[",printbody(e1), "","[", printbody(e2),"]]"]*)          | E.Img (fid,alpha,pos)=> String.concat [" V", iTos(fid),"_",handleAlpha alpha,"["(*,
53          | E.Img (fid,alpha,pos)=> String.concat [" V", iTos(fid),"_",handleAlpha alpha,"[",                  (String.concatWith "," (List.map printbody pos)),"]"*)]
                 (String.concatWith "," (List.map printbody pos)),"]"]  
   
54            | E.Sqrt e => String.concat[ "√(", printbody e ,")"]            | E.Sqrt e => String.concat[ "√(", printbody e ,")"]
55          | E.PowInt(e,n1) => String.concat[  "(",printbody e ,")^",iTos n1]          | E.PowInt(e,n1) => String.concat[  "(",printbody e ,")^",iTos n1]
56          | E.PowReal(e,n1) => String.concat[ "(", printbody e ,")^",RationalEin.toString n1]          | E.PowReal(e,n1) => String.concat[ "(", printbody e ,")^",RationalEin.toString n1]
57            | E.Cosine e=>  String.concat["Cosine(",printbody e ,")"]
58            | E.ArcCosine e=> String.concat["ArcCosine(",printbody e ,")"]
59            | E.Sine e => String.concat["Sine(",printbody e ,")"]
60            | E.ArcSine e => String.concat["ArcSine(",printbody e ,")"]
61          (* end case *))          (* end case *))
62    
63      (*printerE:EIN ->string*)      (*printerE:EIN ->string*)
# Line 72  Line 74 
74              | Param(_,_)=""              | Param(_,_)=""
75    
76          in          in
77              String.concat["-EIN-" ,Param(params, 0)," <",printbody(body),">"," _{",Index(index,0),"} "]             String.concat["-EIN-" (*,Param(params, 0)*)," <",printbody(body),">"," _{",Index(index,0),"} "]
78    
79          end          end
80    
81      end (* local *)      end (* local *)

Legend:
Removed from v.3017  
changed lines
  Added in v.3324

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0