Skip to content

Commit

Permalink
Merge branch 'release-0.7.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
martinholters committed Jun 5, 2018
2 parents 79baa1c + 610d676 commit 5d4b842
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 16 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ACME.jl - Analog Circuit Modeling and Emulation for Julia

[![Join the chat at https://gitter.im/HSU-ANT/ACME.jl](https://badges.gitter.im/HSU-ANT/ACME.jl.svg)](https://gitter.im/HSU-ANT/ACME.jl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Documentation](https://img.shields.io/badge/docs-v0.7.1-blue.svg)](https://hsu-ant.github.io/ACME.jl/v0.7.1)
[![Documentation](https://img.shields.io/badge/docs-v0.7.2-blue.svg)](https://hsu-ant.github.io/ACME.jl/v0.7.2)

ACME is a [Julia](http://julialang.org/) package for the simulation of
electrical circuits, focusing on audio effect circuits. It allows to
Expand Down Expand Up @@ -122,7 +122,7 @@ fail to run altogether.

## Moving on

There is some [documentation](https://hsu-ant.github.io/ACME.jl/v0.7.1)
There is some [documentation](https://hsu-ant.github.io/ACME.jl/v0.7.2)
available for how
to use ACME. Additionally, you can take a look at the examples that can be found
in the `examples` directory below `Pkg.dir("ACME")`.
Expand Down
3 changes: 2 additions & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
julia 0.6
Compat 0.64.0
Compat 0.65.0
DataStructures 0.2.9
IterTools 0.1.0
ProgressMeter 0.2.1
StatsBase 0.23.0
8 changes: 6 additions & 2 deletions src/ACME.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export DiscreteModel, run!, steadystate, steadystate!, linearize, ModelRunner

using Compat.SparseArrays: SparseMatrixCSC, dropzeros!, findnz,
nonzeros, sparse, spzeros
using Compat.LinearAlgebra: I, axpy!, lufact
using Compat.LinearAlgebra: I, axpy!
import Compat.LinearAlgebra.BLAS

using ProgressMeter
Expand Down Expand Up @@ -463,7 +463,11 @@ nn(model::DiscreteModel, subidx) = size(model.fqs[subidx], 2)
nn(model::DiscreteModel) = reduce(+, 0, size(fq, 2) for fq in model.fqs)

function steadystate(model::DiscreteModel, u=zeros(nu(model)))
IA_LU = lufact(I-model.a)
@static if VERSION < v"0.7.0-DEV.5211"
IA_LU = Compat.LinearAlgebra.lufact(I-model.a)
else
IA_LU = Compat.LinearAlgebra.lu(I-model.a)
end
steady_z = zeros(nn(model))
zoff = 1
for idx in 1:length(model.solvers)
Expand Down
12 changes: 1 addition & 11 deletions src/compat.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,14 @@
# See accompanying license file.

import Compat
using Compat: @warn, BitSet, argmax, argmin, copyto!, findall, undef
using Compat: @warn, BitSet, argmax, argmin, copyto!, findall, rmul!, undef
using Compat.Markdown: @doc_str

if isdefined(Base, :NamedTuple) # 0.7.0-DEV.2738 to 0.7.0-DEV.3226
kwargs_pairs(kwargs::NamedTuple) = pairs(kwargs)
end
kwargs_pairs(kwargs) = kwargs

@static if !isdefined(Compat.LinearAlgebra, :rmul!) # prior to 0.7.0-DEV.3665
if VERSION < v"0.7.0-DEV.3563"
const rmul! = Compat.LinearAlgebra.scale!
else
const rmul! = Compat.LinearAlgebra.mul1!
end
else
using Compat.LinearAlgebra: rmul!
end

@static if !isdefined(Compat.SparseArrays, :blockdiag) # prior to 0.7.0-DEV.4498
const blockdiag = Compat.SparseArrays.blkdiag
else
Expand Down
1 change: 1 addition & 0 deletions src/kdtree.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import Base.deleteat!
import Base.isless
import Base.isempty
using StatsBase: var

mutable struct KDTree{Tcv<:AbstractVector,Tp<:AbstractMatrix}
cut_dim::Vector{Int}
Expand Down

0 comments on commit 5d4b842

Please sign in to comment.