summaryrefslogtreecommitdiff
path: root/tests/general_tests/symphony/symphony_logical2.sce
diff options
context:
space:
mode:
authorHarpreet2015-12-29 00:38:48 +0530
committerHarpreet2015-12-29 00:38:48 +0530
commiteb9ca1191c94059cd7adcf69805906c809fe9712 (patch)
treef98e728341812b8a0eb46aa4159b062a22225f05 /tests/general_tests/symphony/symphony_logical2.sce
parent0eee95dfb1edec6ce52ec3065a3adb1bf169c9f9 (diff)
downloadFOSSEE-Optimization-toolbox-eb9ca1191c94059cd7adcf69805906c809fe9712.tar.gz
FOSSEE-Optimization-toolbox-eb9ca1191c94059cd7adcf69805906c809fe9712.tar.bz2
FOSSEE-Optimization-toolbox-eb9ca1191c94059cd7adcf69805906c809fe9712.zip
Bugs fixed 4
Diffstat (limited to 'tests/general_tests/symphony/symphony_logical2.sce')
-rw-r--r--tests/general_tests/symphony/symphony_logical2.sce10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/general_tests/symphony/symphony_logical2.sce b/tests/general_tests/symphony/symphony_logical2.sce
index 4666fdc..5d0989f 100644
--- a/tests/general_tests/symphony/symphony_logical2.sce
+++ b/tests/general_tests/symphony/symphony_logical2.sce
@@ -11,7 +11,7 @@ lb = repmat(0,3,1);
ub = repmat(%inf,3,1);
// Constraint Matrix
-conMatrix = [3,2,5;
+A = [3,2,5;
2,1,1;
1,1,3;
5,2,4]
@@ -25,9 +25,6 @@ conub = [ 55;26;30;57]
// Row Matrix for telling symphony that the is integer or not
isInt = [repmat(%f,1,3)];
-// Calling Symphony
-[x,f,status,output] = symphony(3,4,c,isInt,lb,ub,conMatrix,conlb,conub,-1)
-disp("x",x,"f",f,"status",status,"output",output);
// Output
//Problem loaded into environment.
//
@@ -54,3 +51,8 @@ disp("x",x,"f",f,"status",status,"output",output);
// 1.6
//
// x
+
+// Calling Symphony
+[x,f,status,output] = symphony(3,4,c,isInt,lb,ub,A,conlb,conub,-1)
+disp("x",x,"f",f,"status",status,"output",output);
+