linprog help updated

14 files changed, 16 insertions, 11 deletions

diff --git a/help/en_US/linprog.xml b/help/en_US/linprog.xml
index 47dd715..c293b7e 100755
--- a/help/en_US/linprog.xml
+++ b/help/en_US/linprog.xml
@@ -123,6 +123,7 @@ The lambda data structure contains the Lagrange multipliers at the end
 of optimization. In the current version the values are returned only when the the solution is optimal.
 It has type "struct" and contains the following fields.
 <itemizedlist>
+<listitem>lambda.lower: The Lagrange multipliers for variable lower bounds.</listitem>
 <listitem>lambda.eqlin: The Lagrange multipliers for the linear equality constraints.</listitem>
 <listitem>lambda.ineqlin: The Lagrange multipliers for the linear inequality constraints.</listitem>
 </itemizedlist>
diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS
index 8d14e4f..b948b9f 100644
--- a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS
+++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS
diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS
index 070a255..ee68e51 100644
--- a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS
+++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS
diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS
index 2019f3f..0bf9a64 100644
--- a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS
+++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS
diff --git a/help/en_US/scilab_en_US_help/linprog.html b/help/en_US/scilab_en_US_help/linprog.html
index c47e448..157265a 100644
--- a/help/en_US/scilab_en_US_help/linprog.html
+++ b/help/en_US/scilab_en_US_help/linprog.html
@@ -100,7 +100,8 @@ It has type &#0034;struct&#0034; and contains the following fields.
    <p class="para">The lambda data structure contains the Lagrange multipliers at the end
 of optimization. In the current version the values are returned only when the the solution is optimal.
 It has type &#0034;struct&#0034; and contains the following fields.
-<ul class="itemizedlist"><li>lambda.eqlin: The Lagrange multipliers for the linear equality constraints.</li>
+<ul class="itemizedlist"><li>lambda.lower: The Lagrange multipliers for variable lower bounds.</li>
+<li>lambda.eqlin: The Lagrange multipliers for the linear equality constraints.</li>
 <li>lambda.ineqlin: The Lagrange multipliers for the linear inequality constraints.</li></ul></p>
    <p class="para"></p></div>
 
diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar
index 88b99f5..e241e4c 100644
--- a/jar/scilab_en_US_help.jar
+++ b/jar/scilab_en_US_help.jar
diff --git a/macros/linprog.bin b/macros/linprog.bin
index 12a9f7d..1d3a5aa 100644
--- a/macros/linprog.bin
+++ b/macros/linprog.bin
diff --git a/macros/linprog.sci b/macros/linprog.sci
index 5b12241..c7df21b 100644
--- a/macros/linprog.sci
+++ b/macros/linprog.sci
@@ -84,6 +84,7 @@ function [xopt,fopt,exitflag,output,lambda] = linprog (varargin)
 	// of optimization. In the current version the values are returned only when the the solution is optimal. 
 	// It has type "struct" and contains the following fields.
 	// <itemizedlist>
+	//   <listitem>lambda.lower: The Lagrange multipliers for variable lower bounds.</listitem>
 	//   <listitem>lambda.eqlin: The Lagrange multipliers for the linear equality constraints.</listitem>
 	//   <listitem>lambda.ineqlin: The Lagrange multipliers for the linear inequality constraints.</listitem>
 	// </itemizedlist>
diff --git a/macros/matrix_linprog.bin b/macros/matrix_linprog.bin
index ac4d8d9..e3a9db3 100644
--- a/macros/matrix_linprog.bin
+++ b/macros/matrix_linprog.bin
diff --git a/macros/matrix_linprog.sci b/macros/matrix_linprog.sci
index c1f53a0..daf4168 100755
--- a/macros/matrix_linprog.sci
+++ b/macros/matrix_linprog.sci
@@ -206,11 +206,11 @@ function [xopt,fopt,exitflag,output,lambda] = matrix_linprog (varargin)
                   
    output.Iterations = iter;
    output.constrviolation = max([0;norm(Aeq*xopt-beq, 'inf');(lb-xopt);(xopt-ub);(A*xopt-b)]);
-   lambda = struct("reduced_cost"           , [], ..
+   lambda = struct("lower"           , [], ..
                    "ineqlin"           , [], ..
                    "eqlin"      , []);
    
-    lambda.reduced_cost = Zl;
+    lambda.lower = Zl;
 	lambda.eqlin = dual(1:nbConEq);
 	lambda.ineqlin = dual(nbConEq+1:nbCon);
 	select status
diff --git a/sci_gateway/cpp/LinCLP.hpp b/sci_gateway/cpp/LinCLP.hpp
index 90964f4..bd08505 100755
--- a/sci_gateway/cpp/LinCLP.hpp
+++ b/sci_gateway/cpp/LinCLP.hpp
@@ -43,13 +43,15 @@ class LinCLP
 
 		double objValue_ =0 ;		//Optimal values of objective
 
-		double status_ = 0; 			//Return Status
+		double status_ = 0; 		//Return Status
 
 		double iterations_ = 0;		//Number of iteration 
 
-		double* reducedCost_ = NULL;	//Reduced cost
+		double* Zl_ = NULL;			//Reduced cost
 
-		double* dual_ = NULL;			// Dual of the solution
+		double* Zu_ = NULL;			//Reduced cost
+
+		double* dual_ = NULL;		// Dual of the solution
 
 
 	public:
diff --git a/sci_gateway/cpp/libFOSSEE_Optimization_Toolbox.so b/sci_gateway/cpp/libFOSSEE_Optimization_Toolbox.so
index 1f7e424..3cf9d8a 100755
--- a/sci_gateway/cpp/libFOSSEE_Optimization_Toolbox.so
+++ b/sci_gateway/cpp/libFOSSEE_Optimization_Toolbox.so
diff --git a/sci_gateway/cpp/sci_LinCLP.cpp b/sci_gateway/cpp/sci_LinCLP.cpp
index 7996bfc..41f004d 100644
--- a/sci_gateway/cpp/sci_LinCLP.cpp
+++ b/sci_gateway/cpp/sci_LinCLP.cpp
@@ -26,7 +26,7 @@ LinCLP::~LinCLP()
 		 	free(lb_);
 		 	free(ub_);
 			free(xValue_);
-			free(reducedCost_);
+			free(Zl_);
 			free(dual_);}
 
 //Clp Solver function definition
@@ -104,8 +104,8 @@ LinCLP::LinCLP(int numVars_ , int numCons_ ,double objMatrix_[] , double conMatr
    //get lower vector
    const double* LinCLP::getReducedCost()
 	{
-		reducedCost_ = si->getReducedCost();
-		return reducedCost_;
+		Zl_ = si->getReducedCost();
+		return Zl_;
 	}
 
    //get dual vector
diff --git a/sci_gateway/cpp/sci_LinProg.cpp b/sci_gateway/cpp/sci_LinProg.cpp
index 8a4ec25..95538ec 100644
--- a/sci_gateway/cpp/sci_LinProg.cpp
+++ b/sci_gateway/cpp/sci_LinProg.cpp
@@ -130,7 +130,7 @@ int sci_linearprog(char *fname)
 	double iterations = Prob->iterCount();
 
 	//get reduced cost
-	double* reducedCost = Prob->getReducedCost();
+	double* Zl = Prob->getReducedCost();
 
 	//get dual vector
 	double* dual = Prob->getDual();
@@ -139,7 +139,7 @@ int sci_linearprog(char *fname)
 	returnDoubleMatrixToScilab(2 , 1 , 1 , &objValue);
 	returnDoubleMatrixToScilab(3 , 1 , 1 , &status);
 	returnDoubleMatrixToScilab(4 , 1 , 1 , &iterations);
-	returnDoubleMatrixToScilab(5 , 1 , nVars , reducedCost);
+	returnDoubleMatrixToScilab(5 , 1 , nVars , Zl);
 	returnDoubleMatrixToScilab(6 , 1 , nCons , dual);
 
 	}