From eb9ca1191c94059cd7adcf69805906c809fe9712 Mon Sep 17 00:00:00 2001 From: Harpreet Date: Tue, 29 Dec 2015 00:38:48 +0530 Subject: Bugs fixed 4 --- tests/general_tests/symphony/symphony_conlb1.sce | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tests/general_tests/symphony/symphony_conlb1.sce') diff --git a/tests/general_tests/symphony/symphony_conlb1.sce b/tests/general_tests/symphony/symphony_conlb1.sce index fe100e0..2fa595d 100644 --- a/tests/general_tests/symphony/symphony_conlb1.sce +++ b/tests/general_tests/symphony/symphony_conlb1.sce @@ -1,4 +1,4 @@ -// Check for size of conlb +// Check for size of constraint lower bound // A basic case : // Objective function @@ -11,7 +11,7 @@ lb = repmat(0,8,1); ub = [repmat(1,4,1);repmat(%inf,4,1)]; // Constraint Matrix -conMatrix = [5,3,4,6,1,1,1,1; +A = [5,3,4,6,1,1,1,1; 5*0.05,3*0.04,4*0.05,6*0.03,0.08,0.07,0.06,0.03; 5*0.03,3*0.03,4*0.04,6*0.04,0.06,0.07,0.08,0.09;] @@ -24,10 +24,12 @@ conub = [ 25; 1.25; 1.25] // Row Matrix for telling symphony that the is integer or not isInt = [repmat(%t,1,4) repmat(%f,1,4)]; -// Calling Symphony -[x,f,status,output] = symphony(8,3,c,isInt,lb,ub,conMatrix,conlb,conub,1) - // Error //Symphony: The Lower Bound of constraint is not equal to the number of constraint //at line 226 of function symphony called by : -//[x,f,status,output] = symphony(8,3,c,isInt,lb,ub,conMatrix,conlb,conub,1) +//[x,f,status,output] = symphony(8,3,c,isInt,lb,ub,A,conlb,conub,1) + +// Calling Symphony +[x,f,status,output] = symphony(8,3,c,isInt,lb,ub,A,conlb,conub,1) + + -- cgit