From c68bcbe1824c365e20135b9fbf0a4af213207ed6 Mon Sep 17 00:00:00 2001 From: Martin Holters Date: Fri, 29 Sep 2017 09:42:32 +0200 Subject: [PATCH] Fix deprecations due to JuliaLang/julia#23812 --- src/ACME.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ACME.jl b/src/ACME.jl index a8f6bb8c..eabb3f06 100644 --- a/src/ACME.jl +++ b/src/ACME.jl @@ -289,7 +289,7 @@ function connect!(c::Circuit, pins::Union{Pin,Symbol}...) nets = unique([netfor!(c, pin) for pin in pins]) for net in nets[2:end] append!(nets[1], net) - deleteat!(c.nets, findfirst(c.nets, net)) + deleteat!(c.nets, findfirst(n -> n == net, c.nets)) for (name, named_net) in c.net_names if named_net == net c.net_names[name] = nets[1] @@ -309,7 +309,7 @@ end row = 1; for col = 1:size(incidence)[2] - rows = filter(r -> r ≥ row, find(incidence[:, col])) + rows = filter(r -> r ≥ row, find(!iszero, incidence[:, col])) @assert length(rows) ≤ 2 isempty(rows) && continue @@ -323,7 +323,7 @@ end incidence[rows[2],:] = incidence[rows[2],:] + incidence[row,:] end if incidence[row, col] < 0 - cols = find(incidence[row, :]) + cols = find(!iszero, incidence[row, :]) incidence[row,cols] = -incidence[row,cols] end rows = find(incidence[1:row-1, col] .== 1)