Skip to content

Commit

Permalink
Use transpose instead of ' syntax (#101)
Browse files Browse the repository at this point in the history
Fixes a problem in julia 0.7

Also a minor fix to keep the julia name in uuid_to_name
  • Loading branch information
carlobaldassi authored and KristofferC committed Jan 9, 2018
1 parent e294caf commit d001509
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/GraphType.jl
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ mutable struct Graph
adjdict[p0][p1] = j1

bm = trues(spp[p1], spp[p0])
bmt = bm'
bmt = transpose(bm)

push!(gmsk[p0], bm)
push!(gmsk[p1], bmt)
Expand Down Expand Up @@ -470,12 +470,13 @@ function check_consistency(graph::Graph)
@assert length(gmsk0) == length(gadj0)
@assert length(adjdict0) == length(gadj0)
for (j0,p1) in enumerate(gadj0)
@assert p1 p0
@assert adjdict[p1][p0] == j0
spp1 = spp[p1]
@assert size(gmsk0[j0]) == (spp1,spp0)
j1 = adjdict0[p1]
gmsk1 = gmsk[p1]
@assert gmsk1[j1] == gmsk0[j0]'
@assert gmsk1[j1] == transpose(gmsk0[j0])
end
end
for (p,p0) in pdict
Expand Down Expand Up @@ -1120,7 +1121,7 @@ function build_eq_classes1!(graph::Graph, p0::Int)

# concatenate all the constraints; the columns of the
# result encode the behavior of each version
cmat = vcat(BitMatrix(gconstr[p0]'), gmsk[p0]...)
cmat = vcat(BitMatrix(transpose(gconstr[p0])), gmsk[p0]...)
cvecs = [cmat[:,v0] for v0 = 1:spp[p0]]

# find unique behaviors
Expand Down
1 change: 1 addition & 0 deletions src/Operations.jl
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ function deps_graph(env::EnvCache, uuid_to_name::Dict{UUID,String}, reqs::Requir
end

for uuid in uuids
uuid == uuid_julia && continue
try
uuid_to_name[uuid] = registered_name(env, uuid)
end
Expand Down

0 comments on commit d001509

Please sign in to comment.