From d5356061fbd3a9b3052dee25bd9c82c375c42e22 Mon Sep 17 00:00:00 2001
From: Harpreet
Date: Thu, 31 Dec 2015 16:03:57 +0530
Subject: Macros example updated

---
 tests/general_tests/lsqlin/lsqlin_logical1.sce | 54 +++++++++++---------------
 1 file changed, 22 insertions(+), 32 deletions(-)

(limited to 'tests/general_tests/lsqlin/lsqlin_logical1.sce')

diff --git a/tests/general_tests/lsqlin/lsqlin_logical1.sce b/tests/general_tests/lsqlin/lsqlin_logical1.sce
index bc0dc06..959cc7c 100644
--- a/tests/general_tests/lsqlin/lsqlin_logical1.sce
+++ b/tests/general_tests/lsqlin/lsqlin_logical1.sce
@@ -1,51 +1,41 @@
-// Check for elements in A
-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];
+// An example with inequality constraints
+C = [2 0;
+	-1 1;
+	 0 2]
+d = [1
+	 0
+    -1];
+A = [10 -2;
+	 -2 10];
+b = [4
+    -4];
 
-// Output
+//Output
 //Optimal Solution Found.
 // lambda  =
 // 
-//   lower: [0,0,0,0]
-//   upper: [0,0,0,0]
+//   lower: [0,0]
+//   upper: [0,0]
 //   eqlin: [0x0 constant]
-//   ineqlin: [8.697D-11,0.0925859,0.1118582]
+//   ineqlin: [0.0000422,0.0000089]
 // output  =
 // 
-//   Iterations: 7
+//   Iterations: 13
 // exitflag  =
 // 
 //  0  
 // residual  =
 // 
-//    0.0126031  
-//    0.0208054  
-//    0.1295085  
-//    0.0057397  
-//  - 0.0137246  
+//    0.3335021  
+//    0.6666002  
+//  - 0.3332976  
 // resnorm  =
 // 
-//    0.0175855  
+//    0.6666667  
 // xopt  =
 // 
-//    0.1298639  
-//  - 0.5756958  
-//    0.4251033  
-//    0.2438436  
+//    0.3332490  
+//  - 0.3333512  
 
 [xopt,resnorm,residual,exitflag,output,lambda] = lsqlin(C,d,A,b)
 
-- 
cgit