Skip to content

Commit 0bea06e

Browse files
committed
tidy test case file locations
1 parent 7baa8a2 commit 0bea06e

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed
File renamed without changes.
File renamed without changes.

test/tp_opf.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
end
1515
end
1616
@testset "5-bus 5-phase ac case" begin
17-
mp_data = PMs.parse_file("../test/data/matlab/case5.m")
17+
mp_data = PMs.parse_file("../test/data/matpower/case5.m")
1818
PMs.make_multiconductor(mp_data, 3)
1919
result = run_tp_opf(mp_data, PMs.ACPPowerModel, ipopt_solver)
2020

@@ -27,7 +27,7 @@
2727
end
2828

2929
@testset "5-bus 5-phase soc case" begin
30-
mp_data = PMs.parse_file("../test/data/matlab/case5.m")
30+
mp_data = PMs.parse_file("../test/data/matpower/case5.m")
3131
PMs.make_multiconductor(mp_data, 3)
3232
result = run_tp_opf(mp_data, PMs.SOCWRPowerModel, ipopt_solver)
3333

@@ -39,7 +39,7 @@
3939
end
4040

4141
@testset "30-bus 3-phase ac case" begin
42-
mp_data = PMs.parse_file("../test/data/matlab/case30.m")
42+
mp_data = PMs.parse_file("../test/data/matpower/case30.m")
4343
PMs.make_multiconductor(mp_data, 3)
4444
result = run_tp_opf(mp_data, PMs.ACPPowerModel, ipopt_solver)
4545

@@ -53,7 +53,7 @@
5353
end
5454

5555
@testset "30-bus 3-phase soc case" begin
56-
mp_data = PMs.parse_file("../test/data/matlab/case30.m")
56+
mp_data = PMs.parse_file("../test/data/matpower/case30.m")
5757
PMs.make_multiconductor(mp_data, 3)
5858
result = run_tp_opf(mp_data, PMs.SOCWRPowerModel, ipopt_solver)
5959

@@ -239,7 +239,7 @@ end
239239

240240
@testset "test ac polar opf" begin
241241
@testset "30-bus make-3-phase case" begin
242-
mp_data = PMs.parse_file("../test/data/matlab/case30.m")
242+
mp_data = PMs.parse_file("../test/data/matpower/case30.m")
243243
PMs.make_multiconductor(mp_data, 3)
244244
result = run_tp_opf(mp_data, PMs.ACPPowerModel, ipopt_solver)
245245

@@ -267,7 +267,7 @@ end
267267

268268
@testset "test dc opf" begin
269269
@testset "30-bus make-3-phase case" begin
270-
mp_data = PMs.parse_file("../test/data/matlab/case30.m")
270+
mp_data = PMs.parse_file("../test/data/matpower/case30.m")
271271
PMs.make_multiconductor(mp_data, 3)
272272
result = run_tp_opf(mp_data, PMs.DCPPowerModel, ipopt_solver)
273273

@@ -295,7 +295,7 @@ end
295295

296296
@testset "test nfa opf" begin
297297
@testset "30-bus make-3-phase case" begin
298-
mp_data = PMs.parse_file("../test/data/matlab/case30.m")
298+
mp_data = PMs.parse_file("../test/data/matpower/case30.m")
299299
PMs.make_multiconductor(mp_data, 3)
300300
result = run_tp_opf(mp_data, PMs.NFAPowerModel, ipopt_solver)
301301

@@ -323,7 +323,7 @@ end
323323

324324
@testset "test soc (BIM) opf" begin
325325
@testset "30-bus make-3-phase case" begin
326-
mp_data = PMs.parse_file("../test/data/matlab/case30.m")
326+
mp_data = PMs.parse_file("../test/data/matpower/case30.m")
327327
PMs.make_multiconductor(mp_data, 3)
328328
result = run_tp_opf(mp_data, PMs.SOCWRPowerModel, ipopt_solver)
329329

test/tp_opf_bf.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@test isapprox(result["solution"]["bus"]["3"]["vm"].values, 0.992977*[1,1,1]; atol = 1e-3)
1010
end
1111
@testset "5-bus case" begin
12-
mp_data = PowerModels.parse_file("../test/data/matlab/case5.m")
12+
mp_data = PowerModels.parse_file("../test/data/matpower/case5.m")
1313
PowerModels.make_multiconductor(mp_data, 3)
1414
result = run_tp_opf_bf(mp_data, LPLinUBFPowerModel, ipopt_solver)
1515

@@ -48,7 +48,7 @@ end
4848
# @test isapprox(result["solution"]["bus"]["3"]["vm"].values, 0.974398*[1,1,1]; atol = 1e-3)
4949
end
5050
@testset "5-bus case" begin
51-
mp_data = PowerModels.parse_file("../test/data/matlab/case5.m")
51+
mp_data = PowerModels.parse_file("../test/data/matpower/case5.m")
5252
PowerModels.make_multiconductor(mp_data, 3)
5353
result = run_tp_opf_bf(mp_data, LPdiagUBFPowerModel, ipopt_solver)
5454

@@ -89,7 +89,7 @@ end
8989

9090
end
9191
@testset "5-bus case" begin
92-
mp_data = PowerModels.parse_file("../test/data/matlab/case5.m")
92+
mp_data = PowerModels.parse_file("../test/data/matpower/case5.m")
9393
PowerModels.make_multiconductor(mp_data, 3)
9494
result = run_tp_opf_bf(mp_data, LPfullUBFPowerModel, ipopt_solver)
9595

test/tp_ots.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ end
5252
end
5353

5454
@testset "5-bus 3-phase case" begin
55-
mp_data = PMs.parse_file("../test/data/matlab/case5.m")
55+
mp_data = PMs.parse_file("../test/data/matpower/case5.m")
5656
PMs.make_multiconductor(mp_data, 3)
5757
result = run_tp_ots(mp_data, PMs.DCPPowerModel, pavito_solver)
5858

0 commit comments

Comments
 (0)