FOSSEE · souvikdas95 · Sep 14, 2017 · Sep 14, 2017 · Sep 14, 2017
diff --git a/etc/FOSSEE_Optimization_Toolbox.start b/etc/FOSSEE_Optimization_Toolbox.start
@@ -52,8 +52,9 @@ else
     link(lib_path + "/libcoinmumps.so");
     link(lib_path + "/libipopt.so");
 	link(lib_path + "/libCbc.so");
-    link(lib_path + '/libbonmin.so');
+    link(lib_path + "/libbonmin.so");
     link(lib_path + "/libecos.so");
+    link(lib_path + "/libecos_bb.so");
 
 end
 exec(pathconvert(root_tlbx + filesep() + "sci_gateway" + filesep() + "loader_gateway.sce",%f));

diff --git a/sci_gateway/cpp/FOSSEE_Optimization_Toolbox.c b/sci_gateway/cpp/FOSSEE_Optimization_Toolbox.c
diff --git a/sci_gateway/cpp/FOSSEE_Optimization_Toolbox.def b/sci_gateway/cpp/FOSSEE_Optimization_Toolbox.def
diff --git a/sci_gateway/cpp/FOSSEE_Optimization_Toolbox.dll b/sci_gateway/cpp/FOSSEE_Optimization_Toolbox.dll
diff --git a/sci_gateway/cpp/FOSSEE_Optimization_Toolbox.exp b/sci_gateway/cpp/FOSSEE_Optimization_Toolbox.exp
diff --git a/sci_gateway/cpp/FOSSEE_Optimization_Toolbox.lib b/sci_gateway/cpp/FOSSEE_Optimization_Toolbox.lib
diff --git a/sci_gateway/cpp/Makelib.mak b/sci_gateway/cpp/Makelib.mak
diff --git a/sci_gateway/cpp/Release/FOSSEE_Optimization_Toolbox.obj b/sci_gateway/cpp/Release/FOSSEE_Optimization_Toolbox.obj
diff --git a/sci_gateway/cpp/Release/globals.obj b/sci_gateway/cpp/Release/globals.obj
diff --git a/sci_gateway/cpp/Release/read_mps.obj b/sci_gateway/cpp/Release/read_mps.obj
diff --git a/sci_gateway/cpp/Release/sci_LinProg.obj b/sci_gateway/cpp/Release/sci_LinProg.obj
diff --git a/sci_gateway/cpp/Release/sci_QuadNLP.obj b/sci_gateway/cpp/Release/sci_QuadNLP.obj
diff --git a/sci_gateway/cpp/Release/sci_iofunc.obj b/sci_gateway/cpp/Release/sci_iofunc.obj
diff --git a/sci_gateway/cpp/Release/sci_ipopt.obj b/sci_gateway/cpp/Release/sci_ipopt.obj
diff --git a/sci_gateway/cpp/Release/sci_ipoptfminbnd.obj b/sci_gateway/cpp/Release/sci_ipoptfminbnd.obj
diff --git a/sci_gateway/cpp/Release/sci_ipoptfmincon.obj b/sci_gateway/cpp/Release/sci_ipoptfmincon.obj
diff --git a/sci_gateway/cpp/Release/sci_ipoptfminunc.obj b/sci_gateway/cpp/Release/sci_ipoptfminunc.obj
diff --git a/sci_gateway/cpp/Release/sci_minbndNLP.obj b/sci_gateway/cpp/Release/sci_minbndNLP.obj
diff --git a/sci_gateway/cpp/Release/sci_minconNLP.obj b/sci_gateway/cpp/Release/sci_minconNLP.obj
diff --git a/sci_gateway/cpp/Release/sci_minuncNLP.obj b/sci_gateway/cpp/Release/sci_minuncNLP.obj
diff --git a/sci_gateway/cpp/Release/sci_solver_status_query_functions.obj b/sci_gateway/cpp/Release/sci_solver_status_query_functions.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_addrowcol.obj b/sci_gateway/cpp/Release/sci_sym_addrowcol.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_get_dbl_arr.obj b/sci_gateway/cpp/Release/sci_sym_get_dbl_arr.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_get_iteration_count.obj b/sci_gateway/cpp/Release/sci_sym_get_iteration_count.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_get_matrix.obj b/sci_gateway/cpp/Release/sci_sym_get_matrix.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_get_num_int.obj b/sci_gateway/cpp/Release/sci_sym_get_num_int.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_getinfinity.obj b/sci_gateway/cpp/Release/sci_sym_getinfinity.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_getobjsense.obj b/sci_gateway/cpp/Release/sci_sym_getobjsense.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_getrowact.obj b/sci_gateway/cpp/Release/sci_sym_getrowact.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_isenvactive.obj b/sci_gateway/cpp/Release/sci_sym_isenvactive.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_load_mps.obj b/sci_gateway/cpp/Release/sci_sym_load_mps.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_loadproblem.obj b/sci_gateway/cpp/Release/sci_sym_loadproblem.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_openclose.obj b/sci_gateway/cpp/Release/sci_sym_openclose.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_primalbound.obj b/sci_gateway/cpp/Release/sci_sym_primalbound.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_remove.obj b/sci_gateway/cpp/Release/sci_sym_remove.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_rowmod.obj b/sci_gateway/cpp/Release/sci_sym_rowmod.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_set_indices.obj b/sci_gateway/cpp/Release/sci_sym_set_indices.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_set_variables.obj b/sci_gateway/cpp/Release/sci_sym_set_variables.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_setcolsoln.obj b/sci_gateway/cpp/Release/sci_sym_setcolsoln.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_setobj.obj b/sci_gateway/cpp/Release/sci_sym_setobj.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_solution.obj b/sci_gateway/cpp/Release/sci_sym_solution.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_solve.obj b/sci_gateway/cpp/Release/sci_sym_solve.obj
diff --git a/sci_gateway/cpp/Release/sci_sym_varbounds.obj b/sci_gateway/cpp/Release/sci_sym_varbounds.obj
diff --git a/sci_gateway/cpp/Release/sci_vartype.obj b/sci_gateway/cpp/Release/sci_vartype.obj
diff --git a/sci_gateway/cpp/builder_gateway_cpp.sce b/sci_gateway/cpp/builder_gateway_cpp.sce
@@ -111,7 +111,9 @@ Function_Names = [
 		"solveminuncp","sci_solveminuncp"
 		"solveminbndp","sci_solveminbndp"
 		"solveminconp","sci_solveminconp"
-
+
+		//ecos function
+		"solveecos","sci_ecos"		
 	];
 
 //Name of all the files to be compiled
@@ -154,6 +156,8 @@ Files = [
 		"sci_ipoptfmincon.cpp",
 		"sci_LinProg.cpp",
         "read_mps.cpp"
+
+		'ecos.cpp'
 	]
 else
 //Name of All the Functions
@@ -327,21 +331,31 @@ Version = opt(2);
 if getos()=="Windows" then
 	third_dir = path_builder+filesep()+'..'+filesep()+'..'+filesep()+'thirdparty';
 	lib_base_dir = third_dir + filesep() + 'windows' + filesep() + 'lib' + filesep() + Version + filesep();
-	inc_base_dir = third_dir + filesep() + 'windows' + filesep() + 'include' + filesep() + 'coin';
+	inc_base_dir = third_dir + filesep() + 'windows' + filesep() + 'include';
+	inc_coin_dir = inc_base_dir + filesep() + 'coin';
+	inc_ecos_dir = inc_base_dir + filesep() + 'ecos';
     C_Flags=['-D__USE_DEPRECATED_STACK_FUNCTIONS__ -w -I '+path_builder+' '+ '-I '+inc_base_dir+' ']
+	C_Flags = C_Flags + ['-I ' + inc_coin_dir + ' '];
+	C_Flags = C_Flags + ['-I ' + inc_ecos_dir + ' '];
     Linker_Flag  = [lib_base_dir+"libClp.lib "+lib_base_dir+"libCgl.lib "+lib_base_dir+"libOsi.lib "+lib_base_dir+"libOsiClp.lib "+lib_base_dir+"libCoinUtils.lib "+lib_base_dir+"libSymphony.lib "+lib_base_dir+"IpOptFSS.lib "+lib_base_dir+"IpOpt-vc10.lib "]
-
+	Linker_Flag = Linker_Flag + [lib_base_dir + "AMD.lib "];
+	Linker_Flag = Linker_Flag + [lib_base_dir + "LDL.lib "];
+	Linker_Flag = Linker_Flag + [lib_base_dir + "ECOS.lib "];
+	Linker_Flag = Linker_Flag + [lib_base_dir + "ECOS_BB.lib "];
 else
 	third_dir = path_builder+filesep()+'..'+filesep()+'..'+filesep()+'thirdparty';
 	lib_base_dir = third_dir + filesep() + 'linux' + filesep() + 'lib' + filesep() + Version + filesep();
-	inc_base_dir = third_dir + filesep() + 'linux' + filesep() + 'include' + filesep() + 'coin';
-
+	inc_base_dir = third_dir + filesep() + 'linux' + filesep() + 'include';
+	inc_coin_dir = inc_base_dir + filesep() + 'coin';
+	inc_ecos_dir = inc_base_dir + filesep() + 'ecos';
     C_Flags=["-D__USE_DEPRECATED_STACK_FUNCTIONS__ -w -fpermissive -I"+path_builder+" -I"+inc_base_dir+" -Wl,-rpath="+lib_base_dir+" "]
-
+	C_Flags = C_Flags + ["-I" + inc_coin_dir + " "];
+	C_Flags = C_Flags + ["-I" + inc_ecos_dir + " "];
     Linker_Flag = ["-L"+lib_base_dir+"libSym"+" "+"-L"+lib_base_dir+"libipopt"+" "+"-L"+lib_base_dir+"libClp"+" "+"-L"+lib_base_dir+"libOsiClp"+" "+"-L"+lib_base_dir+"libCoinUtils" ]
-
+	Linker_Flag = Linker_Flag + ["-L" + lib_base_dir + "libecos "];
+	Linker_Flag = Linker_Flag + ["-L" + lib_base_dir + "libecos_bb "];
 end
 
 tbx_build_gateway(toolbox_title,Function_Names,Files,get_absolute_file_path("builder_gateway_cpp.sce"), [], Linker_Flag, C_Flags);
 
-clear toolbox_title Function_Names Files Linker_Flag C_Flags;
+clear toolbox_title Function_Names Files Linker_Flag C_Flags;
diff --git a/sci_gateway/cpp/ecos.cpp b/sci_gateway/cpp/ecos.cpp
@@ -10,15 +10,17 @@
 // Email: toolbox@scilab.in
 
 #include "sci_iofunc.hpp"
+
+#include "ecos.h"
+#include "ecos_bb.h"
+
 extern "C"
 {
 	#include <api_scilab.h>
 	#include <Scierror.h>
 	#include <BOOL.h>
 	#include <localization.h>
 	#include <sciprint.h>
-	#include <ecos.h>
-	#include <ecos_bb.h>
 
 	// function to convert int to idxint
 	idxint * int2idxint(int * sci_int, int n) {