summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>2016-11-10 08:34:05 +0100
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2016-11-10 08:34:05 +0100
commit1eb9bbe738e6358c85921ce917b13c4f380ca954 (patch)
tree51c12311dda51136ac4c677ffb2c085a64e410f0
parentd262726698a17e08bb50f5b72c4de16250600cf3 (diff)
downloadscilab-1eb9bbe738e6358c85921ce917b13c4f380ca954.zip
scilab-1eb9bbe738e6358c85921ce917b13c4f380ca954.tar.gz
utf: optimization 2
Change-Id: I77cee4270844963228ead97225e965d1a9820bfb
-rw-r--r--scilab/modules/optimization/sci_gateway/cpp/sci_readmps.cpp1
-rw-r--r--scilab/modules/optimization/src/cpp/optimizationfunctions.cpp10
2 files changed, 5 insertions, 6 deletions
diff --git a/scilab/modules/optimization/sci_gateway/cpp/sci_readmps.cpp b/scilab/modules/optimization/sci_gateway/cpp/sci_readmps.cpp
index 1f81064..1ab1059 100644
--- a/scilab/modules/optimization/sci_gateway/cpp/sci_readmps.cpp
+++ b/scilab/modules/optimization/sci_gateway/cpp/sci_readmps.cpp
@@ -54,7 +54,6 @@ types::Function::ReturnValue sci_readmps(types::typed_list &in, int _iRetCount,
54 int line = 0; 54 int line = 0;
55 char typrow[2]; 55 char typrow[2];
56 56
57 wchar_t* wcsFileName = NULL;
58 char* strErrorBuf = new char[bsiz]; 57 char* strErrorBuf = new char[bsiz];
59 58
60 double big = NumericConstants::double_max; 59 double big = NumericConstants::double_max;
diff --git a/scilab/modules/optimization/src/cpp/optimizationfunctions.cpp b/scilab/modules/optimization/src/cpp/optimizationfunctions.cpp
index 78b3117..303f2c0 100644
--- a/scilab/modules/optimization/src/cpp/optimizationfunctions.cpp
+++ b/scilab/modules/optimization/src/cpp/optimizationfunctions.cpp
@@ -112,7 +112,7 @@ void OptimizationFunctions::execCostf(int *ind, int *n, double *x, double *f, do
112 ConfigVariable::EntryPointStr* func = ConfigVariable::getEntryPoint(m_pStringOptimCostfFunctionDyn->get(0)); 112 ConfigVariable::EntryPointStr* func = ConfigVariable::getEntryPoint(m_pStringOptimCostfFunctionDyn->get(0));
113 if (func == NULL) 113 if (func == NULL)
114 { 114 {
115 sprintf(errorMsg, _("Undefined function '%ls'.\n"), m_pStringOptimCostfFunctionDyn->get(0)); 115 sprintf(errorMsg, _("Undefined function '%s'.\n"), m_pStringOptimCostfFunctionDyn->get(0));
116 throw ast::InternalError(errorMsg); 116 throw ast::InternalError(errorMsg);
117 } 117 }
118 ((costf_t)(func->functionPtr))(ind, n, x, f, g, ti, tr, td); 118 ((costf_t)(func->functionPtr))(ind, n, x, f, g, ti, tr, td);
@@ -141,7 +141,7 @@ void OptimizationFunctions::execFsolveFct(int* n, double* x, double* v, int* ifl
141 ConfigVariable::EntryPointStr* func = ConfigVariable::getEntryPoint(m_pStringFsolveFctFunctionDyn->get(0)); 141 ConfigVariable::EntryPointStr* func = ConfigVariable::getEntryPoint(m_pStringFsolveFctFunctionDyn->get(0));
142 if (func == NULL) 142 if (func == NULL)
143 { 143 {
144 sprintf(errorMsg, _("Undefined function '%ls'.\n"), m_pStringFsolveFctFunctionDyn->get(0)); 144 sprintf(errorMsg, _("Undefined function '%s'.\n"), m_pStringFsolveFctFunctionDyn->get(0));
145 throw ast::InternalError(errorMsg); 145 throw ast::InternalError(errorMsg);
146 } 146 }
147 ((fct_t)(func->functionPtr))(n, x, v, iflag); 147 ((fct_t)(func->functionPtr))(n, x, v, iflag);
@@ -168,7 +168,7 @@ void OptimizationFunctions::execFsolveJac(int* n, double* x, double* v, double*
168 ConfigVariable::EntryPointStr* func = ConfigVariable::getEntryPoint(m_pStringFsolveJacFunctionDyn->get(0)); 168 ConfigVariable::EntryPointStr* func = ConfigVariable::getEntryPoint(m_pStringFsolveJacFunctionDyn->get(0));
169 if (func == NULL) 169 if (func == NULL)
170 { 170 {
171 sprintf(errorMsg, _("Undefined function '%ls'.\n"), m_pStringFsolveJacFunctionDyn->get(0)); 171 sprintf(errorMsg, _("Undefined function '%s'.\n"), m_pStringFsolveJacFunctionDyn->get(0));
172 throw ast::InternalError(errorMsg); 172 throw ast::InternalError(errorMsg);
173 } 173 }
174 // c or fortran jac fuction are the same proto as fct 174 // c or fortran jac fuction are the same proto as fct
@@ -199,7 +199,7 @@ void OptimizationFunctions::execLsqrsolveFct(int* m, int* n, double* x, double*
199 ConfigVariable::EntryPointStr* func = ConfigVariable::getEntryPoint(m_pStringFsolveFctFunctionDyn->get(0)); 199 ConfigVariable::EntryPointStr* func = ConfigVariable::getEntryPoint(m_pStringFsolveFctFunctionDyn->get(0));
200 if (func == NULL) 200 if (func == NULL)
201 { 201 {
202 sprintf(errorMsg, _("Undefined function '%ls'.\n"), m_pStringFsolveFctFunctionDyn->get(0)); 202 sprintf(errorMsg, _("Undefined function '%s'.\n"), m_pStringFsolveFctFunctionDyn->get(0));
203 throw ast::InternalError(errorMsg); 203 throw ast::InternalError(errorMsg);
204 } 204 }
205 ((lsqrfct_t)(func->functionPtr))(m, n, x, v, iflag); 205 ((lsqrfct_t)(func->functionPtr))(m, n, x, v, iflag);
@@ -226,7 +226,7 @@ void OptimizationFunctions::execLsqrsolveJac(int* m, int* n, double* x, double*
226 ConfigVariable::EntryPointStr* func = ConfigVariable::getEntryPoint(m_pStringFsolveJacFunctionDyn->get(0)); 226 ConfigVariable::EntryPointStr* func = ConfigVariable::getEntryPoint(m_pStringFsolveJacFunctionDyn->get(0));
227 if (func == NULL) 227 if (func == NULL)
228 { 228 {
229 sprintf(errorMsg, _("Undefined function '%ls'.\n"), m_pStringFsolveJacFunctionDyn->get(0)); 229 sprintf(errorMsg, _("Undefined function '%s'.\n"), m_pStringFsolveJacFunctionDyn->get(0));
230 throw ast::InternalError(errorMsg); 230 throw ast::InternalError(errorMsg);
231 } 231 }
232 // c or fortran jac fuction are the same proto as fct 232 // c or fortran jac fuction are the same proto as fct