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

revision 3369, Mon Nov 2 19:38:34 2015 UTC revision 3440, Mon Nov 16 19:16:54 2015 UTC
# Line 16  Line 16 
16      fun handleAlpha alpha= String.concat[String.concatWith "," (List.map handleIndex alpha)]      fun handleAlpha alpha= String.concat[String.concatWith "," (List.map handleIndex alpha)]
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        fun printbody b= (case b
   
     fun printbody term = (case term  
20          of E.Const r => iTos(r)          of E.Const r => iTos(r)
21          | E.ConstR r =>RationalEin.toString r          | E.ConstR r =>RationalEin.toString r
22          | E.Tensor(id, []) =>String.concat[" S",iTos(id)]          | E.Tensor(id, []) =>String.concat[" S",iTos(id)]
# Line 41  Line 39 
39          | E.Div(e1,e2) => String.concat ["(",printbody(e1),")/( ",printbody (e2),")"]          | E.Div(e1,e2) => String.concat ["(",printbody(e1),")/( ",printbody (e2),")"]
40          | E.Partial alpha => String.concat["d/dx_",handleAlpha alpha]          | E.Partial alpha => String.concat["d/dx_",handleAlpha alpha]
41          | E.Apply(e1, e2)=> String.concat [ printbody(e1),"@{", printbody(e2),"} "]          | E.Apply(e1, e2)=> String.concat [ printbody(e1),"@{", printbody(e2),"} "]
   
42          | 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),")|"]
                 | E.Conv(fid,alpha, tid, [b0,b1])=> String.concat["|v",iTos(fid),"_{",handleAlpha alpha, "}★h2(",iTos(tid),")dx_",handleAlpha [b0,b1],"}|"]  
43          | E.Conv(fid,alpha, tid, beta)=> String.concat["|v",iTos(fid),"_{",handleAlpha alpha, "}★h(",iTos(tid),")dx_",handleAlpha beta,"}|"]          | E.Conv(fid,alpha, tid, beta)=> String.concat["|v",iTos(fid),"_{",handleAlpha alpha, "}★h(",iTos(tid),")dx_",handleAlpha beta,"}|"]
44   (*          | E.Probe (e1,e2)=> String.concat [printbody(e1),"[", printbody(e2),"]"]
          | E.Conv(fid,alpha, tid,[])=> String.concat["F_",handleAlpha alpha]  
          | E.Conv(fid,alpha, tid, beta)=> String.concat["F_",handleAlpha alpha,"∇",handleAlpha beta]  
  *)  
         | E.Probe (e1,e2)=> String.concat [printbody(e1)(*,"[", printbody(e2),"]"*)]  
45          | E.Img (fid,alpha,pos)=> String.concat [" V", iTos(fid),"_",handleAlpha alpha,"[",          | E.Img (fid,alpha,pos)=> String.concat [" V", iTos(fid),"_",handleAlpha alpha,"[",
46                  (String.concatWith "," (List.map printbody pos)),"]"]                  (String.concatWith "," (List.map printbody pos)),"]"]
47          | E.Sqrt e => String.concat[ "√(", printbody e ,")"]          | E.Sqrt e => String.concat[ "√(", printbody e ,")"]
48          | E.PowInt(e,n1) => String.concat[  "(",printbody e ,")^",iTos n1]          | E.PowInt(e,n1) => String.concat[  "(",printbody e ,")^",Int.toString n1]
49          | E.PowReal(e,n1) => String.concat[ "(", printbody e ,")^",RationalEin.toString n1]          | E.PowReal(e,n1) => String.concat[ "(", printbody e ,")^",RationalEin.toString n1]
         | E.Cosine e=>  String.concat["Cosine(",printbody e ,")"]  
         | E.ArcCosine e=> String.concat["ArcCosine(",printbody e ,")"]  
         | E.Sine e => String.concat["Sine(",printbody e ,")"]  
         | E.ArcSine e => String.concat["ArcSine(",printbody e ,")"]  
50  | E.PowEmb (e,sx,n)=>String.concat["POW(",printbody e,"^", iTos n,")"]  | E.PowEmb (e,sx,n)=>String.concat["POW(",printbody e,"^", iTos n,")"]
51            | E.Trig(t,e)=>(case t
52                of  E.Cosine =>  String.concat["Cosine(",printbody e ,")"]
53                | E.ArcCosine => String.concat["ArcCosine(",printbody e ,")"]
54                | E.Sine  => String.concat["Sine(",printbody e ,")"]
55                | E.ArcSine  => String.concat["ArcSine(",printbody e ,")"]
56                | E.Tangent  => String.concat["Tangent(",printbody e ,")"]
57                | E.ArcTangent => String.concat["ArcTangent(",printbody e ,")"]
58                (*end case*))
59            | E.Exp e1=> String.concat["E^(",printbody e1,")"]
60          (* end case *))          (* end case *))
61    
62      (*printerE:EIN ->string*)      (*printerE:EIN ->string*)
# Line 76  Line 73 
73              | Param(_,_)=""              | Param(_,_)=""
74    
75          in          in
76             String.concat["-EIN-" (*,Param(params, 0)*)," <",printbody(body),">"," _{",Index(index,0),"} "]             String.concat["-EIN-" ,Param(params, 0)," <",printbody(body),">"," _{",Index(index,0),"} "]
77    
78          end          end
79    

Legend:
Removed from v.3369  
changed lines
  Added in v.3440

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