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 /demos | |
| parent | f1aea635ba1d5778860a335d1bf9546ee7adfc7f (diff) | |
| download | symphony-33bdd144438436b759bc8d0b0beba715f0e39e5d.tar.gz symphony-33bdd144438436b759bc8d0b0beba715f0e39e5d.tar.bz2 symphony-33bdd144438436b759bc8d0b0beba715f0e39e5d.zip | |
output added
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/symphony_knapsack.sce | 4 | ||||
| -rw-r--r-- | demos/symphony_mat_knapsack.sce | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/demos/symphony_knapsack.sce b/demos/symphony_knapsack.sce index ff4a904..12a6788 100644 --- a/demos/symphony_knapsack.sce +++ b/demos/symphony_knapsack.sce @@ -1,7 +1,5 @@ mode (-1) -clc - // Reference // // This problem is taken from @@ -106,7 +104,7 @@ xopt = [0 1 1 0 0 1 0 1 0 1 0 0 0 0 0 0 0 1 0 0 0 0 1 0 1 1 0 1 1 0 1 0 0 0 0 0 fopt = [ 24381 ] // Calling Symphony -[x,f,iter]= symphony(nbVar,nbCon,p,isInt,lb,ub,conMatrix,conLB,conUB,-1,options) +[x,f,status,output]= symphony(nbVar,nbCon,p,isInt,lb,ub,conMatrix,conLB,conUB,-1,options) //========= E N D === O F === D E M O =========// diff --git a/demos/symphony_mat_knapsack.sce b/demos/symphony_mat_knapsack.sce index 76fefee..8fa57f9 100644 --- a/demos/symphony_mat_knapsack.sce +++ b/demos/symphony_mat_knapsack.sce @@ -1,7 +1,5 @@ mode (-1) -clc - // Reference // // This problem is taken from @@ -78,11 +76,14 @@ intcon = [] for i = 1:nbVar intcon = [intcon i]; end + +options = ["time_limit" "40"]; + // The expected solution : // Output variables xopt = [0 1 1 0 0 1 0 1 0 1 0 0 0 0 0 0 0 1 0 0 0 0 1 0 1 1 0 1 1 0 1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 1 1 0 0 1 0 0 1 0 1 0 0 1 0 0 1 0 1 0 0 0 0 0 1 1 0 0 0 0 0 1 1 0 0 1 0 0 1 0] // Optimal value fopt = [ 24381 ] // Calling Symphony -[x,f,iter] = symphony_mat(objCoef,intcon,conMatrix,conUB,[],[],lb,ub); +[x,f,iter] = symphony_mat(objCoef,intcon,conMatrix,conUB,[],[],lb,ub,options); |