summaryrefslogtreecommitdiff
path: root/sci_gateway
diff options
context:
space:
mode:
Diffstat (limited to 'sci_gateway')
-rwxr-xr-xsci_gateway/cpp/LinCLP.hpp8
-rwxr-xr-xsci_gateway/cpp/libFOSSEE_Optimization_Toolbox.sobin199050 -> 199050 bytes
-rw-r--r--sci_gateway/cpp/sci_LinCLP.cpp6
-rw-r--r--sci_gateway/cpp/sci_LinProg.cpp4
4 files changed, 10 insertions, 8 deletions
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
Binary files differ
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);
}