diff options
| author | Harpreet | 2015-09-10 12:37:16 +0530 |
|---|---|---|
| committer | Harpreet | 2015-09-10 12:37:16 +0530 |
| commit | 33bdd144438436b759bc8d0b0beba715f0e39e5d (patch) | |
| tree | f5a5305d24da68ecd984a3d5469f455a83e5344a /tests/unit_tests | |
| parent | f1aea635ba1d5778860a335d1bf9546ee7adfc7f (diff) | |
| download | FOSSEE-Optimization-toolbox-33bdd144438436b759bc8d0b0beba715f0e39e5d.tar.gz FOSSEE-Optimization-toolbox-33bdd144438436b759bc8d0b0beba715f0e39e5d.tar.bz2 FOSSEE-Optimization-toolbox-33bdd144438436b759bc8d0b0beba715f0e39e5d.zip | |
output added
Diffstat (limited to 'tests/unit_tests')
| -rw-r--r-- | tests/unit_tests/symphony_base.tst | 7 | ||||
| -rw-r--r-- | tests/unit_tests/symphony_mat_base.tst | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/tests/unit_tests/symphony_base.tst b/tests/unit_tests/symphony_base.tst index fd11db0..a1f9e2b 100644 --- a/tests/unit_tests/symphony_base.tst +++ b/tests/unit_tests/symphony_base.tst @@ -76,12 +76,9 @@ conub = [ 25; 1.25; 1.25] isInt = [repmat(%t,1,4) repmat(%f,1,4)]; // Calling Symphony -[x,f,iter] = symphony(8,3,c,isInt,lb,ub,conMatrix,conlb,conub,1); +[x,f,status,output] = symphony(8,3,c,isInt,lb,ub,conMatrix,conlb,conub,1); -//In Symphony Library for optimal solution status = 227 -status = sym_getStatus(); - -assert_close ( x , [1 1 0 1 7.25 0 0.25 3.5] , 1.e-7 ); +assert_close ( x , [1 1 0 1 7.25 0 0.25 3.5]' , 1.e-7 ); assert_close ( f , [ 8495] , 1.e-7 ); assert_checkequal( status , 227 ); diff --git a/tests/unit_tests/symphony_mat_base.tst b/tests/unit_tests/symphony_mat_base.tst index 3bf286d..629039b 100644 --- a/tests/unit_tests/symphony_mat_base.tst +++ b/tests/unit_tests/symphony_mat_base.tst @@ -72,12 +72,9 @@ beq = [ 25, 1.25, 1.25] intcon = [1 2 3 4]; // Calling Symphony -[x,f,iter] = symphony_mat(c,intcon,[],[],Aeq,beq,lb,ub); +[x,f,status,output] = symphony_mat(c,intcon,[],[],Aeq,beq,lb,ub); -//In Symphony Library for optimal solution status = 227 -status = sym_getStatus(); - -assert_close ( x , [1 1 0 1 7.25 0 0.25 3.5] , 1.e-7 ); +assert_close ( x , [1 1 0 1 7.25 0 0.25 3.5]' , 1.e-7 ); assert_close ( f , [ 8495] , 1.e-7 ); assert_checkequal( status , 227 ); |