diff --git a/julia/Polycube.jl b/julia/Polycube.jl index d173b4c..c8ef1d6 100644 --- a/julia/Polycube.jl +++ b/julia/Polycube.jl @@ -19,12 +19,12 @@ function getPossibleNeighbors(S::Polycube) possibleSpots = Set{Tuple{Int64, Int64, Int64}}() for p ∈ S.recentCubes push!(possibleSpots, - p + (1, 0, 0), - p + (0, 1, 0), - p + (0, 0, 1), - p - (1, 0, 0), - p - (0, 1, 0), - p - (0, 0, 1) + p .+ (1, 0, 0), + p .+ (0, 1, 0), + p .+ (0, 0, 1), + p .- (1, 0, 0), + p .- (0, 1, 0), + p .- (0, 0, 1) ) end spots = setdiff(possibleSpots, S.cubes) diff --git a/julia/PolycubeCounting.jl b/julia/PolycubeCounting.jl index 9982a13..0a2814f 100644 --- a/julia/PolycubeCounting.jl +++ b/julia/PolycubeCounting.jl @@ -1,6 +1,5 @@ include("Polycube.jl") include("ImmutableOrientedPolycube.jl") -include("TupleMisc.jl") include("plot.jl") using XXhash using Serialization diff --git a/julia/TupleMisc.jl b/julia/TupleMisc.jl deleted file mode 100644 index 70922d9..0000000 --- a/julia/TupleMisc.jl +++ /dev/null @@ -1,3 +0,0 @@ - -Base.:+(X::Tuple{Integer, Integer, Integer}, Y::Tuple{Integer, Integer, Integer}) = (X[1]+Y[1], X[2]+Y[2], X[3]+Y[3]) -Base.:-(X::Tuple{Integer, Integer, Integer}, Y::Tuple{Integer, Integer, Integer}) = (X[1]-Y[1], X[2]-Y[2], X[3]-Y[3])