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

SCM Repository

[diderot] Diff of /branches/charisee/src/compiler/basis/basis-vars.sml
ViewVC logotype

Diff of /branches/charisee/src/compiler/basis/basis-vars.sml

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

revision 2603, Thu Apr 24 03:58:37 2014 UTC revision 2606, Wed Apr 30 16:05:25 2014 UTC
# Line 383  Line 383 
383    
384      val op_innerField = polyVar (N.op_dot, all([DK, SK,NK, SK,SK],      val op_innerField = polyVar (N.op_dot, all([DK, SK,NK, SK,SK],
385          fn [Ty.DIFF k,Ty.SHAPE dd1, Ty.DIM d, Ty.SHAPE dd2,Ty.SHAPE dd3] => let          fn [Ty.DIFF k,Ty.SHAPE dd1, Ty.DIM d, Ty.SHAPE dd2,Ty.SHAPE dd3] => let
386               val _=print "\n E"  
387              val k0=Ty.DiffVar(k, 0)              val k0=Ty.DiffVar(k, 0)
388              val d' = Ty.DimVar d              val d' = Ty.DimVar d
389    
390    
391              val _ = print(String.concat["\n Basis Var Inner product Field. "])              val _ = print(String.concat["\n Basis Var Inner product Field. "])
392    
393              val t1 = Ty.T_Field{diff = Ty.DiffVar(k, 0), dim = Ty.DimVar d, shape = Ty.ShapeVar dd1}              val t1 = Ty.T_Field{diff = k0, dim = Ty.DimVar d, shape = Ty.ShapeVar dd1}
394              val t2 = Ty.T_Field{diff = Ty.DiffVar(k, 0), dim = Ty.DimVar d, shape = Ty.ShapeVar dd2}              val t2 = Ty.T_Field{diff = k0, dim = Ty.DimVar d, shape = Ty.ShapeVar dd2}
395              val t3 = Ty.T_Field{diff = Ty.DiffVar(k, 0), dim = Ty.DimVar d, shape =     Ty.ShapeVar dd3}              val t3 = Ty.T_Field{diff = k0, dim = Ty.DimVar d, shape =     Ty.ShapeVar dd3}
396    
397  (*  (*
             val h = field(k0, d',  Ty.Shape[Ty.DimConst 3, Ty.DimConst 2])  
 *)  
398              val f = field(k0, d',  Ty.Shape[ Ty.DimConst 2])              val f = field(k0, d',  Ty.Shape[ Ty.DimConst 2])
             val h = field(k0, d',  Ty.Shape[])  
399    
400                val h = field(Ty.DiffConst(1), Ty.DimConst 2 ,  Ty.Shape[])
401    
402                val t = Ty.T_Field{diff = Ty.DiffVar(k, 0), dim = Ty.DimVar d, shape = Ty.Shape []}*)
403              in              in
404    
405                  [f,f] --> h                  [t1,t2] --> t3
406              end))              end))
407    
408    

Legend:
Removed from v.2603  
changed lines
  Added in v.2606

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