Skip to content

Commit 5dfae36

Browse files
committed
J is part of graph, not param.
1 parent 582fa2d commit 5dfae36

6 files changed

Lines changed: 6 additions & 6 deletions

src/models/model_fixed.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function model_fixed(optimizer, auxdata)
3535
# Define Yjn (production) as expression
3636
@expression(model, Yjn[j=1:graph.J, n=1:param.N], graph.Zjn[j, n] * Ljn[j, n]^param.a)
3737
# Balanced flow constraints
38-
@constraint(model, Pjn[j in 1:param.J, n in 1:param.N],
38+
@constraint(model, Pjn[j in 1:graph.J, n in 1:param.N],
3939
Cjn[j, n] + sum(A[j, i] * Qin[i, n] for i in 1:graph.ndeg) -
4040
Yjn[j, n] + sum(
4141
ifelse(Qin[i, n] > 0, Apos[j, i], Aneg[j, i]) *

src/models/model_fixed_armington.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function model_fixed_armington(optimizer, auxdata)
3434
@objective(model, Max, U)
3535

3636
# Balanced flow constraints
37-
@constraint(model, Pjn[j in 1:param.J, n in 1:param.N],
37+
@constraint(model, Pjn[j in 1:graph.J, n in 1:param.N],
3838
Cjn[j, n] + sum(A[j, i] * Qin[i, n] for i in 1:graph.ndeg) -
3939
Yjn[j, n] + sum(
4040
ifelse(Qin[i, n] > 0, Apos[j, i], Aneg[j, i]) *

src/models/model_mobility.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function model_mobility(optimizer, auxdata)
3939
# balanced flow constraints
4040
# Yjn = @expression(model, graph.Zjn .* Ljn .^ param.a) # Same thing
4141
@expression(model, Yjn[j=1:graph.J, n=1:param.N], graph.Zjn[j, n] * Ljn[j, n]^param.a)
42-
@constraint(model, Pjn[j in 1:param.J, n in 1:param.N],
42+
@constraint(model, Pjn[j in 1:graph.J, n in 1:param.N],
4343
Cjn[j, n] + sum(A[j, i] * Qin[i, n] for i in 1:graph.ndeg) -
4444
Yjn[j, n] + sum(
4545
ifelse(Qin[i, n] > 0, Apos[j, i], Aneg[j, i]) *

src/models/model_mobility_armington.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function model_mobility_armington(optimizer, auxdata)
3737

3838
# balanced flow constraints
3939
@expression(model, Yjn[j=1:graph.J, n=1:param.N], graph.Zjn[j, n] * Lj[j]^param.a)
40-
@constraint(model, Pjn[j in 1:param.J, n in 1:param.N],
40+
@constraint(model, Pjn[j in 1:graph.J, n in 1:param.N],
4141
Cjn[j, n] + sum(A[j, i] * Qin[i, n] for i in 1:graph.ndeg) -
4242
Yjn[j, n] + sum(
4343
ifelse(Qin[i, n] > 0, Apos[j, i], Aneg[j, i]) *

src/models/model_partial_mobility.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function model_partial_mobility(optimizer, auxdata)
5757
# Balanced flow constraints: same as with unrestricted mobility (no restrictions on goods)
5858
# Yjn = @expression(model, graph.Zjn .* Ljn .^ param.a) # Same thing
5959
@expression(model, Yjn[j=1:graph.J, n=1:param.N], graph.Zjn[j, n] * Ljn[j, n]^param.a)
60-
@constraint(model, Pjn[j in 1:param.J, n in 1:param.N],
60+
@constraint(model, Pjn[j in 1:graph.J, n in 1:param.N],
6161
Cjn[j, n] + sum(A[j, i] * Qin[i, n] for i in 1:graph.ndeg) -
6262
Yjn[j, n] + sum(
6363
ifelse(Qin[i, n] > 0, Apos[j, i], Aneg[j, i]) *

src/models/model_partial_mobility_armington.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function model_partial_mobility_armington(optimizer, auxdata)
5353

5454
# Balanced flow constraints: same as with unrestricted mobility (no restrictions on goods)
5555
@expression(model, Yjn[j=1:graph.J, n=1:param.N], graph.Zjn[j, n] * Lj[j]^param.a)
56-
@constraint(model, Pjn[j in 1:param.J, n in 1:param.N],
56+
@constraint(model, Pjn[j in 1:graph.J, n in 1:param.N],
5757
Cjn[j, n] + sum(A[j, i] * Qin[i, n] for i in 1:graph.ndeg) -
5858
Yjn[j, n] + sum(
5959
ifelse(Qin[i, n] > 0, Apos[j, i], Aneg[j, i]) *

0 commit comments

Comments
 (0)