summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarpreet2015-12-17 10:10:25 +0530
committerHarpreet2015-12-17 10:10:25 +0530
commite12c133c99beee5a8dd04d4f6e8c2d5e07148408 (patch)
tree06da90cb3f6f08f9a55ac0953ebbeac75e709007
parentdd31e7a00ffb7263e25c5787490f142da973b19c (diff)
downloadFOSSEE-Optimization-toolbox-e12c133c99beee5a8dd04d4f6e8c2d5e07148408.tar.gz
FOSSEE-Optimization-toolbox-e12c133c99beee5a8dd04d4f6e8c2d5e07148408.tar.bz2
FOSSEE-Optimization-toolbox-e12c133c99beee5a8dd04d4f6e8c2d5e07148408.zip
symphonymat example fixed
-rw-r--r--demos/symphonymat.dem.sce2
-rw-r--r--help/en_US/symphonymat.xml2
-rw-r--r--macros/symphonymat.sci2
3 files changed, 3 insertions, 3 deletions
diff --git a/demos/symphonymat.dem.sce b/demos/symphonymat.dem.sce
index 553cd99..0c968a7 100644
--- a/demos/symphonymat.dem.sce
+++ b/demos/symphonymat.dem.sce
@@ -78,7 +78,7 @@ conMatrix = [ //Constraint 1
483 336 765 637 981 980 202 35 594 689 602 76 767 693 ..
893 160 785 311 417 748 375 362 617 553 474 915 457 261 350 635 ;
];
-nbVar = size(objCoef,2)
+nbVar = size(objCoef,1)
conUB=[11927 13727 11551 13056 13460 ];
// Lower Bound of variables
lb = repmat(0,1,nbVar)
diff --git a/help/en_US/symphonymat.xml b/help/en_US/symphonymat.xml
index 881092b..d811582 100644
--- a/help/en_US/symphonymat.xml
+++ b/help/en_US/symphonymat.xml
@@ -172,7 +172,7 @@ conMatrix = [ //Constraint 1
483 336 765 637 981 980 202 35 594 689 602 76 767 693 ..
893 160 785 311 417 748 375 362 617 553 474 915 457 261 350 635 ;
];
-nbVar = size(objCoef,2)
+nbVar = size(objCoef,1)
conUB=[11927 13727 11551 13056 13460 ];
// Lower Bound of variables
lb = repmat(0,1,nbVar)
diff --git a/macros/symphonymat.sci b/macros/symphonymat.sci
index 33a1163..5aab6e5 100644
--- a/macros/symphonymat.sci
+++ b/macros/symphonymat.sci
@@ -126,7 +126,7 @@ function [xopt,fopt,status,iter] = symphonymat (varargin)
// 483 336 765 637 981 980 202 35 594 689 602 76 767 693 ..
// 893 160 785 311 417 748 375 362 617 553 474 915 457 261 350 635 ;
// ];
- // nbVar = size(objCoef,2)
+ // nbVar = size(objCoef,1)
// conUB=[11927 13727 11551 13056 13460 ];
// // Lower Bound of variables
// lb = repmat(0,1,nbVar)