diff options
48 files changed, 150 insertions, 102 deletions
diff --git a/demos/symphony_knapsack.sce b/demos/symphony_knapsack.sce index 8f392c7..ff4a904 100644 --- a/demos/symphony_knapsack.sce +++ b/demos/symphony_knapsack.sce @@ -95,7 +95,7 @@ conLB=repmat(0,nbCon,1); // Upper Bound of constraints conUB=[11927 13727 11551 13056 13460 ]'; -options = ["time_limit" "25"]; +options = ["time_limit" "40"]; // The expected solution : diff --git a/etc/Symphony.start b/etc/Symphony.start index 04c4444..a7c3ebe 100644 --- a/etc/Symphony.start +++ b/etc/Symphony.start @@ -38,17 +38,16 @@ if getos()=="Windows" then error(msprintf(gettext("Module is not for Windows."))); else lib_path = root_tlbx + "/thirdparty/linux/lib/" + Version; - link(lib_path + "/libcoinblas.so.1.4.2"); - link(lib_path + "/libcoinlapack.so.1.5.2"); - link(lib_path + "/libCoinUtils.so.3.10.6"); - link(lib_path + "/libClp.so.1.13.6"); - link(lib_path + "/libClpSolver.so.1.13.6"); - link(lib_path + "/libOsi.so.1.12.4"); - link(lib_path + "/libOsiCommonTests.so.1.12.4"); - link(lib_path + "/libOsiClp.so.1.13.6"); - link(lib_path + "/libCgl.so.1.9.4"); - link(lib_path + "/libSym.so.3.6.10"); - link(lib_path + "/libOsiSym.so.3.6.10"); + link(lib_path + "/libCoinUtils.so"); + link(lib_path + "/libClp.so"); + link(lib_path + "/libClpSolver.so"); + link(lib_path + "/libOsi.so"); + link(lib_path + "/libOsiCommonTests.so"); + link(lib_path + "/libOsiClp.so"); + link(lib_path + "/libCgl.so"); + link(lib_path + "/libSym.so"); + link(lib_path + "/libOsiSym.so"); + end exec(pathconvert(root_tlbx + filesep() + "sci_gateway" + filesep() + "loader_gateway.sce",%f)); diff --git a/etc/Symphony.start~ b/etc/Symphony.start~ new file mode 100644 index 0000000..45b97e9 --- /dev/null +++ b/etc/Symphony.start~ @@ -0,0 +1,100 @@ +// Copyright (C) 2015 - IIT Bombay - FOSSEE +// +// Author: Harpreet Singh +// Organization: FOSSEE, IIT Bombay +// Email: harpreet.mertia@gmail.com +// This file must be used under the terms of the CeCILL. +// This source file is licensed as described in the file COPYING, which +// you should have received as part of this distribution. The terms +// are also available at +// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + +mprintf("Start Symphony\n"); + +if ( isdef("sym_open") ) then + warning("Library is already loaded"); + return; +end + +etc_tlbx = get_absolute_file_path("Symphony.start"); +etc_tlbx = getshortpathname(etc_tlbx); +root_tlbx = strncpy( etc_tlbx, length(etc_tlbx)-length("\etc\") ); + +//Load functions library +// ============================================================================= +mprintf("\tLoad macros\n"); +pathmacros = pathconvert( root_tlbx ) + "macros" + filesep(); +symphony_lib = lib(pathmacros); +clear pathmacros; + +// load gateways +// ============================================================================= + +mprintf("\tLoad gateways\n"); +[a, opt] = getversion(); +Version = opt(2); +ilib_verbose(0); +if getos()=="Windows" then + error(msprintf(gettext("Module is not for Windows."))); +else +// lib_path = root_tlbx + "/thirdparty/linux/lib/" + Version; +// link(lib_path + "/libcoinblas.so.1.4.2"); +// link(lib_path + "/libcoinlapack.so.1.5.2"); +// link(lib_path + "/libCoinUtils.so.3.10.6"); +// link(lib_path + "/libClp.so.1.13.6"); +// link(lib_path + "/libClpSolver.so.1.13.6"); +// link(lib_path + "/libOsi.so.1.12.4"); +// link(lib_path + "/libOsiCommonTests.so.1.12.4"); +// link(lib_path + "/libOsiClp.so.1.13.6"); +// link(lib_path + "/libCgl.so.1.9.4"); +// link(lib_path + "/libSym.so.3.6.10"); +// link(lib_path + "/libOsiSym.so.3.6.10"); + + lib_path = "/home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/"; + link(lib_path + "/libCoinUtils.la"); + link(lib_path + "/libClp.la"); + link(lib_path + "/libClpSolver.la"); + link(lib_path + "/libOsi.la"); + link(lib_path + "/libOsiCommonTests.la"); + link(lib_path + "/libOsiClp.la"); + link(lib_path + "/libCgl.la"); + link(lib_path + "/libSym.la"); + link(lib_path + "/libOsiSym.la"); + +end +exec(pathconvert(root_tlbx + filesep() + "sci_gateway" + filesep() + "loader_gateway.sce",%f)); + + + + +// Load and add help chapter +// ============================================================================= +if ( %t ) then +if or(getscilabmode() == ["NW";"STD"]) then + mprintf("\tLoad help\n"); + path_addchapter = pathconvert(root_tlbx+"/jar"); + if ( isdir(path_addchapter) <> [] ) then + add_help_chapter("Symphony", path_addchapter, %F); + clear add_help_chapter; + end + clear path_addchapter; +end +end + +// add demos +// ============================================================================= + +if ( %t ) then +if or(getscilabmode() == ["NW";"STD"]) then + mprintf("\tLoad demos\n"); + pathdemos = pathconvert(root_tlbx+"/demos/sci_symphony.dem.gateway.sce",%f,%t); + add_demo("Symphony",pathdemos); + clear pathdemos ; +end +end + +// ============================================================================= + +clear root_tlbx; +clear etc_tlbx; + diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar Binary files differindex 328c4a0..7007aa0 100644 --- a/jar/scilab_en_US_help.jar +++ b/jar/scilab_en_US_help.jar diff --git a/macros/symphony_call.bin b/macros/symphony_call.bin Binary files differindex 7fecd8b..742ccd5 100644 --- a/macros/symphony_call.bin +++ b/macros/symphony_call.bin diff --git a/macros/symphony_call.sci b/macros/symphony_call.sci index 38b6051..843ad6a 100644 --- a/macros/symphony_call.sci +++ b/macros/symphony_call.sci @@ -42,7 +42,7 @@ function [xopt,fopt,iter] = symphony_call(nbVar,nbCon,objCoef,isInt,LB,UB,conMat status = sym_getStatus(); -// //Closing Symphony Environment -// sym_close(); + //Closing Symphony Environment + sym_close(); endfunction diff --git a/sci_gateway/cpp/.sci_sym_openclose.cpp.swp b/sci_gateway/cpp/.sci_sym_openclose.cpp.swp Binary files differnew file mode 100644 index 0000000..713b5a4 --- /dev/null +++ b/sci_gateway/cpp/.sci_sym_openclose.cpp.swp diff --git a/sci_gateway/cpp/builder_gateway_cpp.sce b/sci_gateway/cpp/builder_gateway_cpp.sce index 1b8b117..fb32d92 100644 --- a/sci_gateway/cpp/builder_gateway_cpp.sce +++ b/sci_gateway/cpp/builder_gateway_cpp.sce @@ -26,6 +26,7 @@ C_Flags=["-w -fpermissive -I"+tools_path+"include/coin -Wl,-rpath="+tools_path+" Linker_Flag = ["-L"+tools_path+"lib/"+Version+filesep()+"libSym"] + //Name of All the Functions Function_Names = [ //for opening/closing environment and checking if it is open/close diff --git a/thirdparty/linux/lib/x64/libCgl.la b/thirdparty/linux/lib/x64/libCgl.la index 47e3f24..77507e6 100644..100755 --- a/thirdparty/linux/lib/x64/libCgl.la +++ b/thirdparty/linux/lib/x64/libCgl.la @@ -14,7 +14,7 @@ library_names='libCgl.so.1.9.4 libCgl.so.1 libCgl.so' old_library='' # Libraries that this one depends upon. -dependency_libs=' /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libOsiClp.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libClpSolver.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libClp.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libOsi.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libCoinUtils.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinlapack.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinblas.la -lgfortranbegin -lgfortran' +dependency_libs=' /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libOsiClp.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libClpSolver.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libClp.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libOsi.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libCoinUtils.la' # Version information for libCgl. current=10 @@ -32,4 +32,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib' +libdir='/home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib' diff --git a/thirdparty/linux/lib/x64/libCgl.so b/thirdparty/linux/lib/x64/libCgl.so new file mode 120000 index 0000000..d21b1e2 --- /dev/null +++ b/thirdparty/linux/lib/x64/libCgl.so @@ -0,0 +1 @@ +libCgl.so.1.9.4
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libCgl.so.1 b/thirdparty/linux/lib/x64/libCgl.so.1 new file mode 120000 index 0000000..d21b1e2 --- /dev/null +++ b/thirdparty/linux/lib/x64/libCgl.so.1 @@ -0,0 +1 @@ +libCgl.so.1.9.4
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libCgl.so.1.9.4 b/thirdparty/linux/lib/x64/libCgl.so.1.9.4 Binary files differindex b6e137d..4297d32 100644..100755 --- a/thirdparty/linux/lib/x64/libCgl.so.1.9.4 +++ b/thirdparty/linux/lib/x64/libCgl.so.1.9.4 diff --git a/thirdparty/linux/lib/x64/libClp.la b/thirdparty/linux/lib/x64/libClp.la index a7934d5..20c88dd 100644..100755 --- a/thirdparty/linux/lib/x64/libClp.la +++ b/thirdparty/linux/lib/x64/libClp.la @@ -14,7 +14,7 @@ library_names='libClp.so.1.13.6 libClp.so.1 libClp.so' old_library='' # Libraries that this one depends upon. -dependency_libs=' /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libCoinUtils.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinlapack.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinblas.la -lgfortranbegin -lgfortran' +dependency_libs=' /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libCoinUtils.la' # Version information for libClp. current=14 @@ -32,4 +32,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib' +libdir='/home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib' diff --git a/thirdparty/linux/lib/x64/libClp.so b/thirdparty/linux/lib/x64/libClp.so new file mode 120000 index 0000000..f5fb53c --- /dev/null +++ b/thirdparty/linux/lib/x64/libClp.so @@ -0,0 +1 @@ +libClp.so.1.13.6
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libClp.so.1 b/thirdparty/linux/lib/x64/libClp.so.1 new file mode 120000 index 0000000..f5fb53c --- /dev/null +++ b/thirdparty/linux/lib/x64/libClp.so.1 @@ -0,0 +1 @@ +libClp.so.1.13.6
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libClp.so.1.13.6 b/thirdparty/linux/lib/x64/libClp.so.1.13.6 Binary files differindex 4b41980..d6a8148 100644..100755 --- a/thirdparty/linux/lib/x64/libClp.so.1.13.6 +++ b/thirdparty/linux/lib/x64/libClp.so.1.13.6 diff --git a/thirdparty/linux/lib/x64/libClpSolver.la b/thirdparty/linux/lib/x64/libClpSolver.la index 3ae6f70..6d24542 100644..100755 --- a/thirdparty/linux/lib/x64/libClpSolver.la +++ b/thirdparty/linux/lib/x64/libClpSolver.la @@ -14,7 +14,7 @@ library_names='libClpSolver.so.1.13.6 libClpSolver.so.1 libClpSolver.so' old_library='' # Libraries that this one depends upon. -dependency_libs=' /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libClp.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libCoinUtils.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinlapack.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinblas.la -lgfortranbegin -lgfortran' +dependency_libs=' /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libClp.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libCoinUtils.la' # Version information for libClpSolver. current=14 @@ -32,4 +32,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib' +libdir='/home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib' diff --git a/thirdparty/linux/lib/x64/libClpSolver.so b/thirdparty/linux/lib/x64/libClpSolver.so new file mode 120000 index 0000000..81f032c --- /dev/null +++ b/thirdparty/linux/lib/x64/libClpSolver.so @@ -0,0 +1 @@ +libClpSolver.so.1.13.6
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libClpSolver.so.1 b/thirdparty/linux/lib/x64/libClpSolver.so.1 new file mode 120000 index 0000000..81f032c --- /dev/null +++ b/thirdparty/linux/lib/x64/libClpSolver.so.1 @@ -0,0 +1 @@ +libClpSolver.so.1.13.6
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libClpSolver.so.1.13.6 b/thirdparty/linux/lib/x64/libClpSolver.so.1.13.6 Binary files differindex c3dada3..149c1d9 100644..100755 --- a/thirdparty/linux/lib/x64/libClpSolver.so.1.13.6 +++ b/thirdparty/linux/lib/x64/libClpSolver.so.1.13.6 diff --git a/thirdparty/linux/lib/x64/libCoinUtils.la b/thirdparty/linux/lib/x64/libCoinUtils.la index 8e5d01c..5760a8d 100644..100755 --- a/thirdparty/linux/lib/x64/libCoinUtils.la +++ b/thirdparty/linux/lib/x64/libCoinUtils.la @@ -14,7 +14,7 @@ library_names='libCoinUtils.so.3.10.6 libCoinUtils.so.3 libCoinUtils.so' old_library='' # Libraries that this one depends upon. -dependency_libs=' /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinlapack.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinblas.la -lgfortranbegin -lgfortran' +dependency_libs='' # Version information for libCoinUtils. current=13 @@ -32,4 +32,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib' +libdir='/home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib' diff --git a/thirdparty/linux/lib/x64/libCoinUtils.so b/thirdparty/linux/lib/x64/libCoinUtils.so new file mode 120000 index 0000000..963c869 --- /dev/null +++ b/thirdparty/linux/lib/x64/libCoinUtils.so @@ -0,0 +1 @@ +libCoinUtils.so.3.10.6
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libCoinUtils.so.3 b/thirdparty/linux/lib/x64/libCoinUtils.so.3 new file mode 120000 index 0000000..963c869 --- /dev/null +++ b/thirdparty/linux/lib/x64/libCoinUtils.so.3 @@ -0,0 +1 @@ +libCoinUtils.so.3.10.6
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libCoinUtils.so.3.10.6 b/thirdparty/linux/lib/x64/libCoinUtils.so.3.10.6 Binary files differindex 619a108..e4cb5a6 100644..100755 --- a/thirdparty/linux/lib/x64/libCoinUtils.so.3.10.6 +++ b/thirdparty/linux/lib/x64/libCoinUtils.so.3.10.6 diff --git a/thirdparty/linux/lib/x64/libOsi.la b/thirdparty/linux/lib/x64/libOsi.la index 525a1bc..9f9aa3d 100644..100755 --- a/thirdparty/linux/lib/x64/libOsi.la +++ b/thirdparty/linux/lib/x64/libOsi.la @@ -14,7 +14,7 @@ library_names='libOsi.so.1.12.4 libOsi.so.1 libOsi.so' old_library='' # Libraries that this one depends upon. -dependency_libs=' /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libCoinUtils.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinlapack.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinblas.la -lgfortranbegin -lgfortran' +dependency_libs=' /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libCoinUtils.la' # Version information for libOsi. current=13 @@ -32,4 +32,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib' +libdir='/home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib' diff --git a/thirdparty/linux/lib/x64/libOsi.so b/thirdparty/linux/lib/x64/libOsi.so new file mode 120000 index 0000000..550dde9 --- /dev/null +++ b/thirdparty/linux/lib/x64/libOsi.so @@ -0,0 +1 @@ +libOsi.so.1.12.4
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libOsi.so.1 b/thirdparty/linux/lib/x64/libOsi.so.1 new file mode 120000 index 0000000..550dde9 --- /dev/null +++ b/thirdparty/linux/lib/x64/libOsi.so.1 @@ -0,0 +1 @@ +libOsi.so.1.12.4
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libOsi.so.1.12.4 b/thirdparty/linux/lib/x64/libOsi.so.1.12.4 Binary files differindex b6f29c7..8f1d85e 100644..100755 --- a/thirdparty/linux/lib/x64/libOsi.so.1.12.4 +++ b/thirdparty/linux/lib/x64/libOsi.so.1.12.4 diff --git a/thirdparty/linux/lib/x64/libOsiClp.la b/thirdparty/linux/lib/x64/libOsiClp.la index bac999e..55f6198 100644..100755 --- a/thirdparty/linux/lib/x64/libOsiClp.la +++ b/thirdparty/linux/lib/x64/libOsiClp.la @@ -14,7 +14,7 @@ library_names='libOsiClp.so.1.13.6 libOsiClp.so.1 libOsiClp.so' old_library='' # Libraries that this one depends upon. -dependency_libs=' /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libOsi.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libClp.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libCoinUtils.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinlapack.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinblas.la -lgfortranbegin -lgfortran' +dependency_libs=' /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libOsi.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libClp.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libCoinUtils.la' # Version information for libOsiClp. current=14 @@ -32,4 +32,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib' +libdir='/home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib' diff --git a/thirdparty/linux/lib/x64/libOsiClp.so b/thirdparty/linux/lib/x64/libOsiClp.so new file mode 120000 index 0000000..9a8ab31 --- /dev/null +++ b/thirdparty/linux/lib/x64/libOsiClp.so @@ -0,0 +1 @@ +libOsiClp.so.1.13.6
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libOsiClp.so.1 b/thirdparty/linux/lib/x64/libOsiClp.so.1 new file mode 120000 index 0000000..9a8ab31 --- /dev/null +++ b/thirdparty/linux/lib/x64/libOsiClp.so.1 @@ -0,0 +1 @@ +libOsiClp.so.1.13.6
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libOsiClp.so.1.13.6 b/thirdparty/linux/lib/x64/libOsiClp.so.1.13.6 Binary files differindex 15def98..e009b1f 100644..100755 --- a/thirdparty/linux/lib/x64/libOsiClp.so.1.13.6 +++ b/thirdparty/linux/lib/x64/libOsiClp.so.1.13.6 diff --git a/thirdparty/linux/lib/x64/libOsiCommonTests.la b/thirdparty/linux/lib/x64/libOsiCommonTests.la index 2e92f8f..5df7087 100644..100755 --- a/thirdparty/linux/lib/x64/libOsiCommonTests.la +++ b/thirdparty/linux/lib/x64/libOsiCommonTests.la @@ -14,7 +14,7 @@ library_names='libOsiCommonTests.so.1.12.4 libOsiCommonTests.so.1 libOsiCommonTe old_library='' # Libraries that this one depends upon. -dependency_libs=' /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libOsi.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libCoinUtils.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinlapack.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinblas.la -lgfortranbegin -lgfortran' +dependency_libs=' /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libOsi.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libCoinUtils.la' # Version information for libOsiCommonTests. current=13 @@ -32,4 +32,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib' +libdir='/home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib' diff --git a/thirdparty/linux/lib/x64/libOsiCommonTests.so b/thirdparty/linux/lib/x64/libOsiCommonTests.so new file mode 120000 index 0000000..c78e00d --- /dev/null +++ b/thirdparty/linux/lib/x64/libOsiCommonTests.so @@ -0,0 +1 @@ +libOsiCommonTests.so.1.12.4
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libOsiCommonTests.so.1 b/thirdparty/linux/lib/x64/libOsiCommonTests.so.1 new file mode 120000 index 0000000..c78e00d --- /dev/null +++ b/thirdparty/linux/lib/x64/libOsiCommonTests.so.1 @@ -0,0 +1 @@ +libOsiCommonTests.so.1.12.4
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libOsiCommonTests.so.1.12.4 b/thirdparty/linux/lib/x64/libOsiCommonTests.so.1.12.4 Binary files differindex cbbf2a5..30254e2 100644..100755 --- a/thirdparty/linux/lib/x64/libOsiCommonTests.so.1.12.4 +++ b/thirdparty/linux/lib/x64/libOsiCommonTests.so.1.12.4 diff --git a/thirdparty/linux/lib/x64/libOsiSym.la b/thirdparty/linux/lib/x64/libOsiSym.la index 96b5026..a55abff 100644..100755 --- a/thirdparty/linux/lib/x64/libOsiSym.la +++ b/thirdparty/linux/lib/x64/libOsiSym.la @@ -14,7 +14,7 @@ library_names='libOsiSym.so.3.6.10 libOsiSym.so.3 libOsiSym.so' old_library='' # Libraries that this one depends upon. -dependency_libs=' /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libSym.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libCgl.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libOsiClp.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libClpSolver.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libClp.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libOsi.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libCoinUtils.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinlapack.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinblas.la -lgfortranbegin -lgfortran -lgomp' +dependency_libs=' /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libSym.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libCgl.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libOsiClp.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libClpSolver.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libClp.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libOsi.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libCoinUtils.la' # Version information for libOsiSym. current=9 @@ -32,4 +32,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib' +libdir='/home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib' diff --git a/thirdparty/linux/lib/x64/libOsiSym.so b/thirdparty/linux/lib/x64/libOsiSym.so new file mode 120000 index 0000000..582a52b --- /dev/null +++ b/thirdparty/linux/lib/x64/libOsiSym.so @@ -0,0 +1 @@ +libOsiSym.so.3.6.10
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libOsiSym.so.3 b/thirdparty/linux/lib/x64/libOsiSym.so.3 new file mode 120000 index 0000000..582a52b --- /dev/null +++ b/thirdparty/linux/lib/x64/libOsiSym.so.3 @@ -0,0 +1 @@ +libOsiSym.so.3.6.10
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libOsiSym.so.3.6.10 b/thirdparty/linux/lib/x64/libOsiSym.so.3.6.10 Binary files differindex ebbe0b0..ca3dc9e 100644..100755 --- a/thirdparty/linux/lib/x64/libOsiSym.so.3.6.10 +++ b/thirdparty/linux/lib/x64/libOsiSym.so.3.6.10 diff --git a/thirdparty/linux/lib/x64/libSym.la b/thirdparty/linux/lib/x64/libSym.la index de982c7..ba9cc4b 100644..100755 --- a/thirdparty/linux/lib/x64/libSym.la +++ b/thirdparty/linux/lib/x64/libSym.la @@ -14,7 +14,7 @@ library_names='libSym.so.3.6.10 libSym.so.3 libSym.so' old_library='' # Libraries that this one depends upon. -dependency_libs=' /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libCgl.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libOsiClp.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libClpSolver.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libClp.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libOsi.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libCoinUtils.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinlapack.la /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinblas.la -lgfortranbegin -lgfortran -lgomp' +dependency_libs=' /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libCgl.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libOsiClp.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libClpSolver.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libClp.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libOsi.la /home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib/libCoinUtils.la' # Version information for libSym. current=9 @@ -32,4 +32,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib' +libdir='/home/harpreet/symphony_work/SYMPHONY-5.6.10/build-debug/lib' diff --git a/thirdparty/linux/lib/x64/libSym.so b/thirdparty/linux/lib/x64/libSym.so new file mode 120000 index 0000000..962910f --- /dev/null +++ b/thirdparty/linux/lib/x64/libSym.so @@ -0,0 +1 @@ +libSym.so.3.6.10
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libSym.so.3 b/thirdparty/linux/lib/x64/libSym.so.3 new file mode 120000 index 0000000..962910f --- /dev/null +++ b/thirdparty/linux/lib/x64/libSym.so.3 @@ -0,0 +1 @@ +libSym.so.3.6.10
\ No newline at end of file diff --git a/thirdparty/linux/lib/x64/libSym.so.3.6.10 b/thirdparty/linux/lib/x64/libSym.so.3.6.10 Binary files differindex 2ccf532..76c62d0 100644..100755 --- a/thirdparty/linux/lib/x64/libSym.so.3.6.10 +++ b/thirdparty/linux/lib/x64/libSym.so.3.6.10 diff --git a/thirdparty/linux/lib/x64/libcoinblas.la b/thirdparty/linux/lib/x64/libcoinblas.la deleted file mode 100644 index bd4670c..0000000 --- a/thirdparty/linux/lib/x64/libcoinblas.la +++ /dev/null @@ -1,35 +0,0 @@ -# libcoinblas.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libcoinblas.so.1' - -# Names of this library. -library_names='libcoinblas.so.1.4.2 libcoinblas.so.1 libcoinblas.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs='' - -# Version information for libcoinblas. -current=5 -age=4 -revision=2 - -# Is this an already installed library? -installed=yes - -# Should we warn about portability when linking against -modules? -shouldnotlink=no - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib' diff --git a/thirdparty/linux/lib/x64/libcoinblas.so.1.4.2 b/thirdparty/linux/lib/x64/libcoinblas.so.1.4.2 Binary files differdeleted file mode 100644 index 1c38804..0000000 --- a/thirdparty/linux/lib/x64/libcoinblas.so.1.4.2 +++ /dev/null diff --git a/thirdparty/linux/lib/x64/libcoinlapack.la b/thirdparty/linux/lib/x64/libcoinlapack.la deleted file mode 100644 index 431350b..0000000 --- a/thirdparty/linux/lib/x64/libcoinlapack.la +++ /dev/null @@ -1,35 +0,0 @@ -# libcoinlapack.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libcoinlapack.so.1' - -# Names of this library. -library_names='libcoinlapack.so.1.5.2 libcoinlapack.so.1 libcoinlapack.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' /home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib/libcoinblas.la -L/usr/lib/gcc/x86_64-linux-gnu/4.4.3 -L/usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../.. -L/usr/lib/x86_64-linux-gnu -lgfortranbegin -lgfortran -lm' - -# Version information for libcoinlapack. -current=6 -age=5 -revision=2 - -# Is this an already installed library? -installed=yes - -# Should we warn about portability when linking against -modules? -shouldnotlink=no - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/home/harpreet/Downloads/SYMPHONY-5.6.10/build/x64//lib' diff --git a/thirdparty/linux/lib/x64/libcoinlapack.so.1.5.2 b/thirdparty/linux/lib/x64/libcoinlapack.so.1.5.2 Binary files differdeleted file mode 100644 index 3b9bcd6..0000000 --- a/thirdparty/linux/lib/x64/libcoinlapack.so.1.5.2 +++ /dev/null |