Macros example updated

1 files changed, 30 insertions, 36 deletions

diff --git a/demos/lsqlin.dem.sce b/demos/lsqlin.dem.sce
index 0b81630..827ba63 100644
--- a/demos/lsqlin.dem.sce
+++ b/demos/lsqlin.dem.sce
@@ -4,46 +4,40 @@ mode(1)
 //
 
 //A simple linear least square example
-C = [0.9501    0.7620    0.6153    0.4057
-0.2311    0.4564    0.7919    0.9354
-0.6068    0.0185    0.9218    0.9169
-0.4859    0.8214    0.7382    0.4102
-0.8912    0.4447    0.1762    0.8936];
-d = [0.0578
-0.3528
-0.8131
-0.0098
-0.1388];
-A = [0.2027    0.2721    0.7467    0.4659
-0.1987    0.1988    0.4450    0.4186
-0.6037    0.0152    0.9318    0.8462];
-b = [0.5251
-0.2026
-0.6721];
+C = [ 2 0;
+-1 1;
+0 2]
+d = [1
+0
+-1];
+A = [10 -2;
+-2 10];
+b = [4
+-4];
 [xopt,resnorm,residual,exitflag,output,lambda] = lsqlin(C,d,A,b)
 // Press ENTER to continue
 halt()   // Press return to continue
  
 //A basic example for equality, inequality constraints and variable bounds
-C = [0.9501    0.7620    0.6153    0.4057
-0.2311    0.4564    0.7919    0.9354
-0.6068    0.0185    0.9218    0.9169
-0.4859    0.8214    0.7382    0.4102
-0.8912    0.4447    0.1762    0.8936];
-d = [0.0578
-0.3528
-0.8131
-0.0098
-0.1388];
-A =[0.2027    0.2721    0.7467    0.4659
-0.1987    0.1988    0.4450    0.4186
-0.6037    0.0152    0.9318    0.8462];
-b =[0.5251
-0.2026
-0.6721];
-Aeq = [3 5 7 9];
-beq = 4;
-lb = -0.1*ones(4,1);
-ub = 2*ones(4,1);
+C = [1 1 1;
+1 1 0;
+0 1 1;
+1 0 0;
+0 0 1]
+d = [89;
+67;
+53;
+35;
+20;]
+A = [3 2 1;
+2 3 4;
+1 2 3];
+b = [191
+209
+162];
+Aeq = [1 2 1];
+beq = 10;
+lb = repmat(0.1,3,1);
+ub = repmat(4,3,1);
 [xopt,resnorm,residual,exitflag,output,lambda] = lsqlin(C,d,A,b,Aeq,beq,lb,ub)
 //========= E N D === O F === D E M O =========//