From dad86bd42cdc2a0e56df9e0591879e5d26fd56fa Mon Sep 17 00:00:00 2001 From: Harpreet Date: Tue, 5 Jan 2016 12:22:43 +0530 Subject: constrviolation and licence file added --- sci_gateway/cpp/.sci_QuadNLP.cpp.swp | Bin 16384 -> 0 bytes sci_gateway/cpp/libFAMOS.so | Bin 122920 -> 122920 bytes sci_gateway/cpp/sci_ipopt.cpp | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 sci_gateway/cpp/.sci_QuadNLP.cpp.swp (limited to 'sci_gateway/cpp') diff --git a/sci_gateway/cpp/.sci_QuadNLP.cpp.swp b/sci_gateway/cpp/.sci_QuadNLP.cpp.swp deleted file mode 100644 index 764077c..0000000 Binary files a/sci_gateway/cpp/.sci_QuadNLP.cpp.swp and /dev/null differ diff --git a/sci_gateway/cpp/libFAMOS.so b/sci_gateway/cpp/libFAMOS.so index ccad147..4ab40e5 100755 Binary files a/sci_gateway/cpp/libFAMOS.so and b/sci_gateway/cpp/libFAMOS.so differ diff --git a/sci_gateway/cpp/sci_ipopt.cpp b/sci_gateway/cpp/sci_ipopt.cpp index cbb71df..635003e 100644 --- a/sci_gateway/cpp/sci_ipopt.cpp +++ b/sci_gateway/cpp/sci_ipopt.cpp @@ -170,7 +170,7 @@ int sci_solveqp(char *fname) ////////// Manage the output argument ////////// - if (rstatus == 0 | rstatus == 1 | rstatus == 2){ + if (rstatus >= 0 | rstatus <= 7){ fX = Prob->getX(); ObjVal = Prob->getObjVal(); iteration = Prob->iterCount(); -- cgit