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
 [diderot] / branches / charisee / src / compiler / basis / basis-vars.sml

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

revision 86, Wed May 26 22:23:17 2010 UTC revision 103, Tue Jun 1 16:04:04 2010 UTC
# Line 167  Line 167
167                end))                end))
168
169    (* functions *)    (* functions *)
170      val fn_CL = polyVar (N.fn_CL, ty([tensor[N3, N3]] --> Ty.vec3Ty))      val fn_CL = polyVar (N.fn_CL, ty([tensor[N3, N3]] --> Ty.realTy))
171
172      val fn_convolve = polyVar (N.fn_convolve, all([DK, NK, SK],      val fn_convolve = polyVar (N.fn_convolve, all([DK, NK, SK],
173              fn [Ty.DIFF k, Ty.DIM d, Ty.SHAPE dd] => let              fn [Ty.DIFF k, Ty.DIM d, Ty.SHAPE dd] => let
# Line 181  Line 181
181
182      val fn_cos = polyVar (N.fn_cos, ty([Ty.realTy] --> Ty.realTy))      val fn_cos = polyVar (N.fn_cos, ty([Ty.realTy] --> Ty.realTy))
183
184      val fn_dot = polyVar (N.fn_dot, allNK(fn tv => [tensor[Ty.DimVar tv]] --> tensor[Ty.DimVar tv]))      val fn_dot = polyVar (N.fn_dot, allNK(fn tv => let
185              val t = tensor[Ty.DimVar tv]
186              in
187                [t, t] --> Ty.realTy
188              end))
189
190      val fn_inside = polyVar (N.fn_inside,       all([DK, NK, SK],      val fn_inside = polyVar (N.fn_inside,       all([DK, NK, SK],
191              fn [Ty.DIFF k, Ty.DIM d, Ty.SHAPE dd] => let              fn [Ty.DIFF k, Ty.DIM d, Ty.SHAPE dd] => let
# Line 210  Line 214
214
215      val fn_pow = polyVar (N.fn_pow, ty([Ty.realTy, Ty.realTy] --> Ty.realTy))      val fn_pow = polyVar (N.fn_pow, ty([Ty.realTy, Ty.realTy] --> Ty.realTy))
216
217  (*      val fn_principleEvec = polyVar (N.fn_principleEvec, all([NK],
218      val fn_principleEvec = Atom.atom "principleEvec"              fn [Ty.DIM d] => let
219  *)                  val d = Ty.DimVar d
220                    in
221                      [tensor[d,d]] --> tensor[d]
222                    end))
223
224      val fn_sin = polyVar (N.fn_sin, ty([Ty.realTy] --> Ty.realTy))      val fn_sin = polyVar (N.fn_sin, ty([Ty.realTy] --> Ty.realTy))
225

Legend:
 Removed from v.86 changed lines Added in v.103

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