Merge pull request #30 from invenia/rs/restore

Restore `branches_by_breakpoints` changes
invenia · Aug 25, 2022 · c063c92 · c063c92 · raphaelsaavedra · Aug 25, 2022
2 parents a845c8d + a70ea7a
commit c063c92
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "FullNetworkSystems"
 uuid = "877b7152-b508-43dc-81fb-72341a693988"
 authors = ["Invenia Technical Computing Corporation"]
-version = "1.5.1"
+version = "1.6.0"
 
 [deps]
 AxisKeys = "94b1ba4f-4ee9-5380-92f1-94cde586c3c5"

diff --git a/src/accessors.jl b/src/accessors.jl
@@ -138,17 +138,17 @@ function gens_per_zone(system::System)
 end
 
 """
-    branches_by_breakpoints(system::System)
+    branches_by_breakpoints(system::System) -> NTuple{3, Vector{$BranchName}}
 
 Returns three vectors containing of the names of branches which have 0, 1, and 2 breakpoints.
 """
 function branches_by_breakpoints(system::System)
-    zero_bp, one_bp, two_bp = String[], String[], String[]
+    zero_bp, one_bp, two_bp = BranchName[], BranchName[], BranchName[]
     for branch in system.branches
         if branch.is_monitored
-            if all(branch.break_points .== 0.0)
+            if all(iszero, branch.break_points)
                 push!(zero_bp, branch.name)
-            elseif last(branch.break_points) == 0.0
+            elseif iszero(last(branch.break_points))
                 push!(one_bp, branch.name)
             else
                 push!(two_bp, branch.name)

diff --git a/test/system.jl b/test/system.jl
@@ -262,6 +262,7 @@
                 @test zero_bp == ["3"]
                 @test one_bp == ["2"]
                 @test two_bp == ["1", "4"]
+                @test eltype(zero_bp) == eltype(one_bp) == eltype(two_bp) == FullNetworkSystems.BranchName
                 da_system.branches = branches  # reset
 
                 # Check that we can remove the PTDF