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

SCM Repository

[diderot] Diff of /branches/vis15/src/compiler/high-ir/high-ir.sml
ViewVC logotype

Diff of /branches/vis15/src/compiler/high-ir/high-ir.sml

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

revision 4042, Fri Jun 24 19:04:21 2016 UTC revision 4043, Sun Jun 26 14:00:38 2016 UTC
# Line 88  Line 88 
88        | R_Product of ty        | R_Product of ty
89        | R_Mean of ty        | R_Mean of ty
90        | R_Variance of ty        | R_Variance of ty
91        | Kernel of Kernel.kernel * int        | Kernel of Kernel.t * int
92        | Inside of int        | Inside of ImageInfo.info * int
93        | ImageDim of ImageInfo.info * int        | ImageDim of ImageInfo.info * int
94        | BorderCtlDefault of ImageInfo.info        | BorderCtlDefault of ImageInfo.info
95        | BorderCtlClamp of ImageInfo.info        | BorderCtlClamp of ImageInfo.info
# Line 270  Line 270 
270        | same (R_Mean(a0), R_Mean(b0)) = samety(a0, b0)        | same (R_Mean(a0), R_Mean(b0)) = samety(a0, b0)
271        | same (R_Variance(a0), R_Variance(b0)) = samety(a0, b0)        | same (R_Variance(a0), R_Variance(b0)) = samety(a0, b0)
272        | same (Kernel(a0,a1), Kernel(b0,b1)) = Kernel.same(a0, b0) andalso sameint(a1, b1)        | same (Kernel(a0,a1), Kernel(b0,b1)) = Kernel.same(a0, b0) andalso sameint(a1, b1)
273        | same (Inside(a0), Inside(b0)) = sameint(a0, b0)        | same (Inside(a0,a1), Inside(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
274        | same (ImageDim(a0,a1), ImageDim(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (ImageDim(a0,a1), ImageDim(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
275        | same (BorderCtlDefault(a0), BorderCtlDefault(b0)) = ImageInfo.same(a0, b0)        | same (BorderCtlDefault(a0), BorderCtlDefault(b0)) = ImageInfo.same(a0, b0)
276        | same (BorderCtlClamp(a0), BorderCtlClamp(b0)) = ImageInfo.same(a0, b0)        | same (BorderCtlClamp(a0), BorderCtlClamp(b0)) = ImageInfo.same(a0, b0)
# Line 329  Line 329 
329        | hash (R_Mean(a0)) = 0w199 + hashty a0        | hash (R_Mean(a0)) = 0w199 + hashty a0
330        | hash (R_Variance(a0)) = 0w211 + hashty a0        | hash (R_Variance(a0)) = 0w211 + hashty a0
331        | hash (Kernel(a0,a1)) = 0w223 + Kernel.hash a0 + hashint a1        | hash (Kernel(a0,a1)) = 0w223 + Kernel.hash a0 + hashint a1
332        | hash (Inside(a0)) = 0w227 + hashint a0        | hash (Inside(a0,a1)) = 0w227 + ImageInfo.hash a0 + hashint a1
333        | hash (ImageDim(a0,a1)) = 0w229 + ImageInfo.hash a0 + hashint a1        | hash (ImageDim(a0,a1)) = 0w229 + ImageInfo.hash a0 + hashint a1
334        | hash (BorderCtlDefault(a0)) = 0w233 + ImageInfo.hash a0        | hash (BorderCtlDefault(a0)) = 0w233 + ImageInfo.hash a0
335        | hash (BorderCtlClamp(a0)) = 0w239 + ImageInfo.hash a0        | hash (BorderCtlClamp(a0)) = 0w239 + ImageInfo.hash a0
# Line 387  Line 387 
387        | toString (R_Mean(a0)) = concat["R_Mean<", tyToString a0, ">"]        | toString (R_Mean(a0)) = concat["R_Mean<", tyToString a0, ">"]
388        | toString (R_Variance(a0)) = concat["R_Variance<", tyToString a0, ">"]        | toString (R_Variance(a0)) = concat["R_Variance<", tyToString a0, ">"]
389        | toString (Kernel(a0,a1)) = concat["Kernel<", Kernel.toString a0, ",", intToString a1, ">"]        | toString (Kernel(a0,a1)) = concat["Kernel<", Kernel.toString a0, ",", intToString a1, ">"]
390        | toString (Inside(a0)) = concat["Inside<", intToString a0, ">"]        | toString (Inside(a0,a1)) = concat["Inside<", ImageInfo.toString a0, ",", intToString a1, ">"]
391        | toString (ImageDim(a0,a1)) = concat["ImageDim<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (ImageDim(a0,a1)) = concat["ImageDim<", ImageInfo.toString a0, ",", intToString a1, ">"]
392        | toString (BorderCtlDefault(a0)) = concat["BorderCtlDefault<", ImageInfo.toString a0, ">"]        | toString (BorderCtlDefault(a0)) = concat["BorderCtlDefault<", ImageInfo.toString a0, ">"]
393        | toString (BorderCtlClamp(a0)) = concat["BorderCtlClamp<", ImageInfo.toString a0, ">"]        | toString (BorderCtlClamp(a0)) = concat["BorderCtlClamp<", ImageInfo.toString a0, ">"]

Legend:
Removed from v.4042  
changed lines
  Added in v.4043

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