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

SCM Repository

[diderot] Diff of /branches/vis15/src/compiler/ein/ein-util.sml
ViewVC logotype

Diff of /branches/vis15/src/compiler/ein/ein-util.sml

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

revision 3742, Mon Apr 11 04:53:02 2016 UTC revision 3744, Mon Apr 11 22:06:24 2016 UTC
# Line 64  Line 64 
64                  | (E.Apply(e11, e12), E.Apply(e21, e22)) => same(e11, e21) andalso same(e12, e22)                  | (E.Apply(e11, e12), E.Apply(e21, e22)) => same(e11, e21) andalso same(e12, e22)
65                  | (E.Probe(e11, e12), E.Probe(e21, e22)) => same(e11, e21) andalso same(e12, e22)                  | (E.Probe(e11, e12), E.Probe(e21, e22)) => same(e11, e21) andalso same(e12, e22)
66                  | (E.Value i, E.Value j) => (i = j)                  | (E.Value i, E.Value j) => (i = j)
67                  | (E.Img(id1, ix1, pos1, bord1), E.Img(id2, ix2, pos2, bord2)) =>                  | (E.Img(id1, ix1, pos1, s1, bord1), E.Img(id2, ix2, pos2, s2, bord2)) =>
68                      (id1 = id2) andalso sameList(pos1, pos2) andalso sameIndex(ix1, ix2) andalso (bord1 = bord2)                      (id1 = id2) andalso sameList(pos1, pos2) andalso sameIndex(ix1, ix2) andalso (bord1 = bord2) andalso (s1 = s2)
69                  | (E.Krn(id1, ix1, dim1), E.Krn(id2, ix2, dim2)) =>                  | (E.Krn(id1, ix1, dim1), E.Krn(id2, ix2, dim2)) =>
70                      (id1 = id2) andalso sameKx(ix1, ix2) andalso (dim1 =  dim2)                      (id1 = id2) andalso sameKx(ix1, ix2) andalso (dim1 =  dim2)
71                  | (E.Sum(c1, e1), E.Sum(c2, e2)) => sameSx(c1, c2) andalso same(e1, e2)                  | (E.Sum(c1, e1), E.Sum(c2, e2)) => sameSx(c1, c2) andalso same(e1, e2)
# Line 124  Line 124 
124                  | E.Apply(e1, e2) => 0w97 + hash' e1 + hash' e2                  | E.Apply(e1, e2) => 0w97 + hash' e1 + hash' e2
125                  | E.Probe(e1, e2) => 0w101 + hash' e1 + hash' e2                  | E.Probe(e1, e2) => 0w101 + hash' e1 + hash' e2
126                  | E.Value _ => 0w11                  | E.Value _ => 0w11
127                  | E.Img (_, alpha, es, _) => 0w43 + hashAlpha alpha + iter es                  | E.Img (_, alpha, es, _,  _) => 0w43 + hashAlpha alpha + iter es
128                  | E.Krn (_, dels, dim) => 0w41 + hashDels dels + hashInt dim                  | E.Krn (_, dels, dim) => 0w41 + hashDels dels + hashInt dim
129                  | E.Sum(c,e1) => 0w53 + hash' e1                  | E.Sum(c,e1) => 0w53 + hash' e1
130                  | E.Op1(e1,e2) => (case e1                  | E.Op1(e1,e2) => (case e1

Legend:
Removed from v.3742  
changed lines
  Added in v.3744

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