Merge pull request #74 from Electa-Git/fix_issue_candiate_branch

Bug fix on candidate converters
Electa-Git · Jan 26, 2022 · e4d4eea · e4d4eea · hakanergun · Jan 26, 2022
2 parents b81affe + 4dfbbbd
commit e4d4eea
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -2,7 +2,7 @@ name = "PowerModelsACDC"
 uuid = "ff45984e-d068-5f4c-9e32-c4133509d236"
 autors = ["Hakan Ergun", "Frederik Geth", "Jay Dave"]
 repo = "https://github.com/Electa-Git/PowerModelsACDC.jl"
-version = "0.5.0"
+version = "0.5.1"
 
 [deps]
 InfrastructureModels = "2030c09a-7f63-5d83-885d-db604e0e9cc0"

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ The latest stable release of PowerModelACDC can be installed using the Julia pac
 ```julia
 Pkg.add("PowerModelsACDC")
 ```
-The current version of PowerModelsACDC is 0.5.0 and is compatible with PowerModels v0.19.1, InfrastrucureModels v0.7.2
+The current version of PowerModelsACDC is 0.5.1 and is compatible with PowerModels v0.19.1, InfrastrucureModels v0.7.2
 
 
 **Core Problem Specifications**

diff --git a/docs/src/objective.md b/docs/src/objective.md
@@ -1,5 +1,15 @@
 # Objective
 
+**OPF Objective**
+* Minimisation of active power geneation costs
+**TNEP Objectives**
+* Minimisation of consturction cost for HVDC branches and converters
+* Minimisation of consturction cost for HVDC branches and converters and AC branches (acdc_tnep)
+* Minimisation of consturction cost for HVDC branches and converters and generation costs
+* Minimisation of consturction cost for HVDC branches and converters and generation costs and AC branches(acdc_tnep)
+
+
+
 ```@meta
 CurrentModule = PowerModelsACDC
 ```

diff --git a/src/core/base.jl b/src/core/base.jl
@@ -219,7 +219,7 @@ function add_candidate_dcgrid!(ref::Dict{Symbol,<:Any}, data::Dict{String,<:Any}
             bus_convs_dc_ne = Dict([(bus["busdc_i"], []) for (i,bus) in nw_ref[:busdc]])
             for (i,conv) in nw_ref[:convdc_ne]
                 if haskey(bus_convs_dc_ne, conv["busdc_i"])
-                    push!(bus_convs_dc_ne, i)
+                    push!(bus_convs_dc_ne[conv["busdc_i"]], i)
                 end
             end
             nw_ref[:bus_convs_dc_ne] = bus_convs_dc_ne

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -16,7 +16,7 @@ using Juniper
 
 using Test
 
-local_test = false   # as some tests require Mosek, only limited set sent to travis.
+local_test = false   # as some tests require Mosek, only limited set sent to CI.
 
 ipopt_solver = JuMP.optimizer_with_attributes(Ipopt.Optimizer, "tol" => 1e-6, "print_level" => 0)
 scs_solver = JuMP.optimizer_with_attributes(SCS.Optimizer, "verbose" => 0)