Merge pull request #314 from JuliaDynamics/hw/deprecated

mv deprecated stuff to separate file

Author: hexaeder

src/NetworkDynamics.jl

@@ -75,8 +75,6 @@ include("symbolicindexing.jl")
 
 export ComponentCondition, ComponentAffect
 export ContinuousComponentCallback, VectorContinuousComponentCallback
-# Export deprecated aliases (constants defined at bottom of callbacks.jl)
-export ContinousComponentCallback, VectorContinousComponentCallback
 export DiscreteComponentCallback, PresetTimeComponentCallback
 export SymbolicView
 include("callbacks.jl")
@@ -176,4 +174,10 @@ using PrecompileTools: @compile_workload
     include("precompile_workload.jl")
 end
 
+####
+#### Deprecated functionality (remove in breaking version)
+####
+export ContinousComponentCallback, VectorContinousComponentCallback
+include("deprecated.jl")
+
 end

src/callbacks.jl

@@ -727,8 +727,3 @@ function assert_cb_compat(comp::ComponentModel, cb)
     cb
 end
 
-####
-#### Backward compatibility aliases for old misspellings (deprecated)
-####
-const ContinousComponentCallback = ContinuousComponentCallback
-const VectorContinousComponentCallback = VectorContinuousComponentCallback

src/deprecated.jl

@@ -0,0 +1,33 @@
+# Deprecated non plural methods
+@deprecate delete_initconstraint!(args...; kwargs...) delete_initconstraints!(args...; kwargs...)
+@deprecate delete_initformula!(args...; kwargs...) delete_initformulas!(args...; kwargs...)
+
+# Deprecated names with typos
+const ContinousComponentCallback = ContinuousComponentCallback
+const VectorContinousComponentCallback = VectorContinuousComponentCallback
+
+# Deprecated symbolic indexing methods
+vidxs(compfilter::Union{Int,AbstractVector{Int},NTuple{<:Any,Int},Colon}, varfilter) = _deprecated_idxs_gen(VIndex, compfilter, varfilter)
+eidxs(compfilter::Union{Int,AbstractVector{Int},NTuple{<:Any,Int},Colon}, varfilter) = _deprecated_idxs_gen(EIndex, compfilter, varfilter)
+vpidxs(compfilter::Union{Int,AbstractVector{Int},NTuple{<:Any,Int},Colon}, varfilter) = _deprecated_idxs_gen(VPIndex, compfilter, varfilter, VIndex)
+epidxs(compfilter::Union{Int,AbstractVector{Int},NTuple{<:Any,Int},Colon}, varfilter) = _deprecated_idxs_gen(EPIndex, compfilter, varfilter, EIndex)
+
+function _deprecated_idxs_gen(constructor, compiter, variter, type=constructor)
+    @warn "*idxs(compfilter, varfilter) methods are deprecated. Use *idxs(nw, compfilter, varfilter) instead."
+    if compiter isa Colon
+        throw(ArgumentError("compfilter cannot be `:`, use *idxs(nw_like_thing,  ...) for that!"))
+    end
+    if variter isa Colon
+        throw(ArgumentError("varfilter cannot be `:`, use *idxs(nw_like_thing,  ...) for that!"))
+    end
+    if variter isa Symbol
+        variter = (variter,)
+    end
+    indices = type[]
+    for ci in compiter
+        for si in variter
+            push!(indices, constructor(ci, si))
+        end
+    end
+    indices
+end

src/metadata.jl

@@ -799,9 +799,6 @@ delete_initformulas!(c::ComponentModel) = delete_metadata!(c, :initformula)
 delete_initformulas!(nw::Network, idx::VCIndex) = delete_initformulas!(getcomp(nw, idx))
 delete_initformulas!(nw::Network, idx::ECIndex) = delete_initformulas!(getcomp(nw, idx))
 
-# Deprecated backward compatibility
-@deprecate delete_initconstraint!(args...; kwargs...) delete_initconstraints!(args...; kwargs...)
-@deprecate delete_initformula!(args...; kwargs...) delete_initformulas!(args...; kwargs...)
 
 
 # generate methods and docstrings for position and marker

src/symbolicindexing.jl

@@ -632,31 +632,6 @@ function epidxs(nw, cf=:, vf=nothing; kwargs...)
     generate_indices(nw, EIndex(cf), vf; s=false, p=true, in=false, out=false, obs=false, kwargs...)
 end
 
-# deprecated methods
-vidxs(compfilter::Union{Int,AbstractVector{Int},NTuple{<:Any,Int},Colon}, varfilter) = _deprecated_idxs_gen(VIndex, compfilter, varfilter)
-eidxs(compfilter::Union{Int,AbstractVector{Int},NTuple{<:Any,Int},Colon}, varfilter) = _deprecated_idxs_gen(EIndex, compfilter, varfilter)
-vpidxs(compfilter::Union{Int,AbstractVector{Int},NTuple{<:Any,Int},Colon}, varfilter) = _deprecated_idxs_gen(VPIndex, compfilter, varfilter, VIndex)
-epidxs(compfilter::Union{Int,AbstractVector{Int},NTuple{<:Any,Int},Colon}, varfilter) = _deprecated_idxs_gen(EPIndex, compfilter, varfilter, EIndex)
-
-function _deprecated_idxs_gen(constructor, compiter, variter, type=constructor)
-    @warn "*idxs(compfilter, varfilter) methods are deprecated. Use *idxs(nw, compfilter, varfilter) instead."
-    if compiter isa Colon
-        throw(ArgumentError("compfilter cannot be `:`, use *idxs(nw_like_thing,  ...) for that!"))
-    end
-    if variter isa Colon
-        throw(ArgumentError("varfilter cannot be `:`, use *idxs(nw_like_thing,  ...) for that!"))
-    end
-    if variter isa Symbol
-        variter = (variter,)
-    end
-    indices = type[]
-    for ci in compiter
-        for si in variter
-            push!(indices, constructor(ci, si))
-        end
-    end
-    indices
-end
 
 
 ####