UPD: Julia v1.6 (LTS), JuMP v0.23 (#39)

* RM: duplcate of add_ct in components.jl

* REF: move data functions to data_model

* UPD: Julia v1.6 (LTS) min

* UPD: JuMP v0.23, compat formatting

* v0.5.1 release prep

* UPD: Int64 to Int

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.0'
+          - '1.6'
           - '1'
           - 'nightly'
         os:

CHANGELOG.md

@@ -4,6 +4,13 @@
 
 - none
 
+## v0.5.1
+
+- Removed duplicate `add_ct` function
+- Refactored to move data functions to data_model folder
+- Updated support to JuMP v0.23
+- Updated to minimum Julia v1.6 (LTS)
+
 ## v0.5.0
 
 - Added support for PowerModelsDistribution 0.14

Project.toml

@@ -1,7 +1,7 @@
 name = "PowerModelsProtection"
 uuid = "719c1aef-945b-435a-a240-4c2992e5e0df"
 authors = ["Art Barnes", "Jose Tabarez"]
-version = "0.5.0"
+version = "0.5.1"
 
 [deps]
 InfrastructureModels = "2030c09a-7f63-5d83-885d-db604e0e9cc0"
@@ -13,13 +13,13 @@ PowerModelsDistribution = "d7431456-977f-11e9-2de3-97ff7677985e"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
 [compat]
-InfrastructureModels = "~0.7.2"
-Ipopt = "~0.9"
-JuMP = "~0.22"
-Graphs = "~1.4.1"
-PowerModels = "~0.19.1"
-PowerModelsDistribution = "~0.13.3, ~0.14"
-julia = "^1"
+InfrastructureModels = "0.7.3"
+Ipopt = "0.9, 1.0.2"
+JuMP = "0.22, 0.23"
+Graphs = "1.4.1, 1.6"
+PowerModels = "0.19.1"
+PowerModelsDistribution = "~0.13.3, 0.14"
+julia = "1.6"
 
 [extras]
 Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"

src/PowerModelsProtection.jl

@@ -28,6 +28,11 @@ module PowerModelsProtection
     include("data_model/components.jl")
     include("data_model/eng2math.jl")
     include("data_model/math2eng.jl")
+    include("data_model/helper_functions.jl")
+    include("data_model/operation.jl")
+    include("data_model/cts.jl")
+    include("data_model/fuses.jl")
+    include("data_model/relays.jl")
 
     include("io/common.jl")
     include("io/dss/dss2eng.jl")
@@ -38,11 +43,5 @@ module PowerModelsProtection
     include("prob/fs_mc.jl")
     include("prob/pf_mc.jl")
 
-    include("core/helper_functions.jl")
-    include("core/operation.jl")
-    include("core/fuses.jl")
-    include("core/relays.jl")
-    include("core/cts.jl")
-
     include("core/export.jl")  # must be last include to properly export functions
 end

src/data_model/components.jl

@@ -224,42 +224,6 @@ function add_fault!(data::Dict{String,Any}, name::String, type::String, bus::Str
 end
 
 
-"""
-    add_ct(data::Dict{String,Any}, element::String, id::String, n_p::Number, n_s::Number;kwargs...)
-
-Function to add current transformer to circuit.
-Inputs 4 if adding first CT, 5 otherwise:
-    (1) data(Dictionary): Result from parse_file(). Circuit information
-    (2) element(String): Element or line that CT is being added to
-    (3) id(String): Optional. For multiple CT on the same line. If not used overwrites previously defined CT1
-    (4) n_p(Number): Primary . Would be the number of  of the relay side of transformer
-    (5) n_s(Number): Secondary . Number of  on line side
-    (6) kwargs: Any other information user wants to add. Not used by anything.
-"""
-function add_ct(data::Dict{String,Any}, element::Union{String,SubString{String}}, id::Union{String,SubString{String}}, n_p::Number, n_s::Number;kwargs...)
-    if !haskey(data, "protection")
-        data["protection"] = Dict{String,Any}()
-    end
-    if haskey(data["line"], "$element")
-        if !haskey(data["protection"], "C_Transformers")
-            data["protection"]["C_Transformers"] = Dict{String,Any}()
-        end
-        if haskey(data["protection"]["C_Transformers"], "$id")
-            @info "$id has been redefined"
-        end
-        data["protection"]["C_Transformers"]["$id"] = Dict{String,Any}(
-            "turns" => [n_p,n_s],
-            "element" => element
-        )
-        kwargs_dict = Dict(kwargs)
-        new_dict = _add_dict(kwargs_dict)
-        merge!(data["protection"]["C_Transformers"]["$id"], new_dict)
-    else
-        @info "Circuit element $element does not exist. No CT added."
-    end
-end
-
-
 """
     _non_ideal_ct(relay_data,CT_data,Iabc)
 

src/core/cts.jl → src/data_model/cts.jl

@@ -1,9 +1,14 @@
 """
-Function to add a current transformer to circuit dictionary.
+    add_ct(data::Dict{String,Any}, element::String, id::String, n_p::Number, n_s::Number;kwargs...)
 
-Inputs(in order):
-
-Circuit dictionary, monitored element, name of fuse, primary and secondary turns. Turns entered seperately and stored as a vector.
+Function to add current transformer to circuit.
+Inputs 4 if adding first CT, 5 otherwise:
+    (1) data(Dictionary): Result from parse_file(). Circuit information
+    (2) element(String): Element or line that CT is being added to
+    (3) id(String): Optional. For multiple CT on the same line. If not used overwrites previously defined CT1
+    (4) n_p(Number): Primary . Would be the number of  of the relay side of transformer
+    (5) n_s(Number): Secondary . Number of  on line side
+    (6) kwargs: Any other information user wants to add. Not used by anything.
 """
 function add_ct(data::Dict{String,Any}, element::Union{String,SubString{String}}, id::Union{String,SubString{String}}, n_p::Number, n_s::Number;kwargs...)
     if !haskey(data, "protection")