Merge pull request #50 from ertam98/master

Fixed errors in variable bounds in some minlp2 instances.

Author: harshangrjn

instances/minlp2/cvxnonsep_normcon20.jl

@@ -7,7 +7,7 @@ m = Model()
 x_Idx = Any[11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
 @variable(m, 0 <= x[x_Idx] <= 5)
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-@variable(m, i[i_Idx] <= 5, Int)
+@variable(m, 0 <= i[i_Idx] <= 5, Int)
 
 
 # ----- Constraints ----- #

instances/minlp2/cvxnonsep_normcon20r.jl

@@ -5,10 +5,13 @@ m = Model()
 # ----- Variables ----- #
 @variable(m, objvar)
 x_Idx = Any[11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41]
-@variable(m, 0 <= x[x_Idx] <= 5)
+@variable(m, x[x_Idx])
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-@variable(m, i[i_Idx] <= 5, Int)
-
+@variable(m, 0 <= i[i_Idx] <= 5, Int)
+for j in 11:20
+	set_lower_bound(x[j], 0)
+	set_upper_bound(x[j], 5)
+end
 
 # ----- Constraints ----- #
 @constraint(m, e1, x[22]+x[23]+x[24]+x[25]+x[26]+x[27]+x[28]+x[29]+x[30]+x[31]+x[32]+x[33]+x[34]+x[35]+x[36]+x[37]+x[38]+x[39]+x[40]+x[41] <= 99.9999)

instances/minlp2/cvxnonsep_normcon30.jl

@@ -7,7 +7,7 @@ m = Model()
 x_Idx = Any[16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30]
 @variable(m, 0 <= x[x_Idx] <= 5)
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-@variable(m, i[i_Idx] <= 5, Int)
+@variable(m, 0 <= i[i_Idx] <= 5, Int)
 
 
 # ----- Constraints ----- #

instances/minlp2/cvxnonsep_normcon30r.jl

@@ -5,10 +5,13 @@ m = Model()
 # ----- Variables ----- #
 @variable(m, objvar)
 x_Idx = Any[16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61]
-@variable(m, 0 <= x[x_Idx] <= 5)
+@variable(m, x[x_Idx])
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-@variable(m, i[i_Idx] <= 5, Int)
-
+@variable(m, 0 <= i[i_Idx] <= 5, Int)
+for j in 16:30
+	set_lower_bound(x[j], 0)
+	set_upper_bound(x[j], 5)
+end
 
 # ----- Constraints ----- #
 @constraint(m, e1, x[32]+x[33]+x[34]+x[35]+x[36]+x[37]+x[38]+x[39]+x[40]+x[41]+x[42]+x[43]+x[44]+x[45]+x[46]+x[47]+x[48]+x[49]+x[50]+x[51]+x[52]+x[53]+x[54]+x[55]+x[56]+x[57]+x[58]+x[59]+x[60]+x[61] <= 99.9999)

instances/minlp2/cvxnonsep_normcon40.jl

@@ -7,7 +7,7 @@ m = Model()
 x_Idx = Any[21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40]
 @variable(m, 0 <= x[x_Idx] <= 5)
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
-@variable(m, i[i_Idx] <= 5, Int)
+@variable(m, 0 <= i[i_Idx] <= 5, Int)
 
 
 # ----- Constraints ----- #

instances/minlp2/cvxnonsep_normcon40r.jl

@@ -5,9 +5,13 @@ m = Model()
 # ----- Variables ----- #
 @variable(m, objvar)
 x_Idx = Any[21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81]
-@variable(m, 0 <= x[x_Idx] <= 5)
+@variable(m, x[x_Idx])
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
-@variable(m, i[i_Idx] <= 5, Int)
+@variable(m, 0 <= i[i_Idx] <= 5, Int)
+for i in 21:40
+	set_lower_bound(x[j], 0)
+	set_upper_bound(x[j], 5)
+end
 
 
 # ----- Constraints ----- #

instances/minlp2/cvxnonsep_nsig20r.jl

@@ -5,9 +5,13 @@ m = Model()
 # ----- Variables ----- #
 @variable(m, objvar)
 x_Idx = Any[11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40]
-@variable(m, 1e-5 <= x[x_Idx] <= 10)
+@variable(m, x[x_Idx])
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
 @variable(m, 1 <= i[i_Idx] <= 10, Int)
+for j in 11:20
+	set_lower_bound(x[j], 1e-5)
+	set_lower_bound(x[j], 10)
+end
 
 
 # ----- Constraints ----- #

instances/minlp2/cvxnonsep_nsig30r.jl

@@ -5,9 +5,13 @@ m = Model()
 # ----- Variables ----- #
 @variable(m, objvar)
 x_Idx = Any[16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61]
-@variable(m, 1e-5 <= x[x_Idx] <= 10)
+@variable(m, x[x_Idx])
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
 @variable(m, 1 <= i[i_Idx] <= 10, Int)
+for j in 16:30
+	set_lower_bound(x[j], 1e-5)
+	set_upper_bound(x[j], 10)
+end
 
 
 # ----- Constraints ----- #

instances/minlp2/cvxnonsep_nsig40r.jl

@@ -5,9 +5,13 @@ m = Model()
 # ----- Variables ----- #
 @variable(m, objvar)
 x_Idx = Any[21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81]
-@variable(m, 1e-5 <= x[x_Idx] <= 10)
+@variable(m, x[x_Idx])
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
 @variable(m, 1 <= i[i_Idx] <= 10, Int)
+for j in 21:40
+	set_lower_bound(x[j], 1e-5)
+	set_upper_bound(x[j], 10)
+end
 
 
 # ----- Constraints ----- #

instances/minlp2/cvxnonsep_pcon20.jl

@@ -7,7 +7,7 @@ m = Model()
 x_Idx = Any[11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
 @variable(m, 0 <= x[x_Idx] <= 5)
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-@variable(m, i[i_Idx] <= 5, Int)
+@variable(m, 0 <= i[i_Idx] <= 5, Int)
 
 
 # ----- Constraints ----- #

instances/minlp2/cvxnonsep_pcon20r.jl

@@ -5,9 +5,13 @@ m = Model()
 # ----- Variables ----- #
 @variable(m, objvar)
 x_Idx = Any[11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40]
-@variable(m, 0 <= x[x_Idx] <= 5)
+@variable(m, x[x_Idx])
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-@variable(m, i[i_Idx] <= 5, Int)
+@variable(m, 0 <= i[i_Idx] <= 5, Int)
+for j in 11:20
+	set_lower_bound(x[j], 0)
+	set_upper_bound(x[j], 5)
+end
 
 
 # ----- Constraints ----- #

instances/minlp2/cvxnonsep_pcon30.jl

@@ -7,7 +7,7 @@ m = Model()
 x_Idx = Any[16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30]
 @variable(m, 0 <= x[x_Idx] <= 5)
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-@variable(m, i[i_Idx] <= 5, Int)
+@variable(m, 0 <= i[i_Idx] <= 5, Int)
 
 # ----- Constraints ----- #
 @constraint(m, e1, 0.52*i[1]+0.94*i[2]+0.64*i[3]+0.96*i[4]+0.24*i[5]+0.68*i[6]+0.29*i[7]+0.67*i[8]+0.7*i[9]+0.07*i[10]+0.25*i[11]+0.22*i[12]+0.67*i[13]+0.84*i[14]+0.34*i[15]+0.78*x[16]+0.68*x[17]+0.01*x[18]+0.6*x[19]+0.39*x[20]+0.92*x[21]+0.1*x[22]+0.46*x[23]+0.77*x[24]+0.32*x[25]+0.78*x[26]+0.37*x[27]+0.78*x[28]+0.47*x[29]+0.04*x[30]+objvar == 0.0)

instances/minlp2/cvxnonsep_pcon30r.jl

@@ -5,9 +5,13 @@ m = Model()
 # ----- Variables ----- #
 @variable(m, objvar)
 x_Idx = Any[16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60]
-@variable(m, 0 <= x[x_Idx] <= 5)
+@variable(m, x[x_Idx])
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-@variable(m, i[i_Idx] <= 5, Int)
+@variable(m, 0 <= i[i_Idx] <= 5, Int)
+for j in 16:30
+	set_lower_bound(x[j], 0)
+	set_upper_bound(x[j], 5)
+end
 
 
 # ----- Constraints ----- #

instances/minlp2/cvxnonsep_pcon40.jl

@@ -7,7 +7,7 @@ m = Model()
 x_Idx = Any[21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40]
 @variable(m, 0 <= x[x_Idx] <= 5)
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
-@variable(m, i[i_Idx] <= 5, Int)
+@variable(m, 0 <= i[i_Idx] <= 5, Int)
 
 
 # ----- Constraints ----- #

instances/minlp2/cvxnonsep_pcon40r.jl

@@ -5,9 +5,13 @@ m = Model()
 # ----- Variables ----- #
 @variable(m, objvar)
 x_Idx = Any[21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80]
-@variable(m, 0 <= x[x_Idx] <= 5)
+@variable(m, x[x_Idx])
 i_Idx = Any[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
-@variable(m, i[i_Idx] <= 5, Int)
+@variable(m, 0 <= i[i_Idx] <= 5, Int)
+for j in 21:40
+	set_lower_bound(x[j], 0)
+	set_upper_bound(x[j], 5)
+end
 
 
 # ----- Constraints ----- #