diff --git a/docs/src/format.md b/docs/src/format.md index 0a61a7a..6714862 100644 --- a/docs/src/format.md +++ b/docs/src/format.md @@ -281,8 +281,7 @@ This section describes the characteristics of transmission system, such as its t | :--------------------- | :----------------------------------------------- | ------- | :------------: | :---: | `Source bus` | Identifier of the bus where the transmission line originates. | Required | No | Yes | `Target bus` | Identifier of the bus where the transmission line reaches. | Required | No | Yes -| `Reactance (ohms)` | Reactance of the transmission line (in ohms). | Required | No | Yes -| `Susceptance (S)` | Susceptance of the transmission line (in siemens). | Required | No | Yes +| `Susceptance (S)` | Susceptance of the transmission line (in siemens). | Required | No | Yes | `Normal flow limit (MW)` | Maximum amount of power (in MW) allowed to flow through the line when the system is in its regular, fully-operational state. | `+inf` | Yes | Yes | `Emergency flow limit (MW)` | Maximum amount of power (in MW) allowed to flow through the line when the system is in degraded state (for example, after the failure of another transmission line). | `+inf` | Y | Yes | `Flow limit penalty ($/MW)` | Penalty for violating the flow limits of the transmission line (in $/MW). This is charged per time step. For example, if there is a thermal violation of 1 MW for three time steps, then three times this amount will be charged. | `5000.0` | Yes | Yes @@ -295,7 +294,6 @@ This section describes the characteristics of transmission system, such as its t "l1": { "Source bus": "b1", "Target bus": "b2", - "Reactance (ohms)": 0.05917, "Susceptance (S)": 29.49686, "Normal flow limit (MW)": 15000.0, "Emergency flow limit (MW)": 20000.0, diff --git a/src/instance/read.jl b/src/instance/read.jl index 10365ab..62b0230 100644 --- a/src/instance/read.jl +++ b/src/instance/read.jl @@ -354,7 +354,6 @@ function _from_json(json; repair = true)::UnitCommitmentScenario length(lines) + 1, name_to_bus[dict["Source bus"]], name_to_bus[dict["Target bus"]], - scalar(dict["Reactance (ohms)"]), scalar(dict["Susceptance (S)"]), timeseries( dict["Normal flow limit (MW)"], diff --git a/src/instance/structs.jl b/src/instance/structs.jl index 3c1b635..4082fb0 100644 --- a/src/instance/structs.jl +++ b/src/instance/structs.jl @@ -56,7 +56,6 @@ mutable struct TransmissionLine offset::Int source::Bus target::Bus - reactance::Float64 susceptance::Float64 normal_flow_limit::Vector{Float64} emergency_flow_limit::Vector{Float64} diff --git a/src/model/formulations/base/sensitivity.jl b/src/model/formulations/base/sensitivity.jl index 0b78740..ea8845b 100644 --- a/src/model/formulations/base/sensitivity.jl +++ b/src/model/formulations/base/sensitivity.jl @@ -10,8 +10,8 @@ using SparseArrays, Base.Threads, LinearAlgebra, JuMP Returns a (B-1)xL matrix M, where B is the number of buses and L is the number of transmission lines. For a given bus b and transmission line l, the entry M[l.offset, b.offset] indicates the amount of power (in MW) that flows through -transmission line l when 1 MW of power is injected at the slack bus (the bus -that has offset zero) and withdrawn from b. +transmission line l when 1 MW of power is injected at b and withdrawn from the +slack bus (the bus that has offset zero). """ function _injection_shift_factors(; buses::Array{Bus}, diff --git a/test/src/instance/read_test.jl b/test/src/instance/read_test.jl index 2ddffbc..bcb3eb4 100644 --- a/test/src/instance/read_test.jl +++ b/test/src/instance/read_test.jl @@ -26,7 +26,6 @@ function instance_read_test() @test sc.lines[5].name == "l5" @test sc.lines[5].source.name == "b2" @test sc.lines[5].target.name == "b5" - @test sc.lines[5].reactance ≈ 0.17388 @test sc.lines[5].susceptance ≈ 10.037550333 @test sc.lines[5].normal_flow_limit == [1e8 for t in 1:4] @test sc.lines[5].emergency_flow_limit == [1e8 for t in 1:4] @@ -36,7 +35,6 @@ function instance_read_test() @test sc.lines[1].name == "l1" @test sc.lines[1].source.name == "b1" @test sc.lines[1].target.name == "b2" - @test sc.lines[1].reactance ≈ 0.059170 @test sc.lines[1].susceptance ≈ 29.496860773945 @test sc.lines[1].normal_flow_limit == [300.0 for t in 1:4] @test sc.lines[1].emergency_flow_limit == [400.0 for t in 1:4]