Move lpSolve to external directory and update copyrights

GeomScale · Feb 29, 2024 · ee66fb4 · ee66fb4
1 parent 7548826
commit ee66fb4
Show file tree

Hide file tree

Showing 100 changed files with 14 additions and 1,077 deletions.
diff --git a/inst/COPYRIGHTS b/inst/COPYRIGHTS
@@ -1,6 +1,6 @@
-All files in src/external are taken from 
-(i) lpsolve (https://cran.r-project.org/src/contrib/Archive/lpSolveAPI) version 5.5.2.0, 
-(ii) bnmin1 (https://www.mrao.cam.ac.uk/~bn204/oof/bnmin1.html) version 1.11
+All files in src/external are taken from
+(i) lpsolve (https://cran.r-project.org/package=lpSolve) version 5.6.20,
+(ii) minimum_ellipsoid (or bnmin1) (https://www.mrao.cam.ac.uk/~bn204/oof/bnmin1.html) version 1.11
 
 Copyrights and modification details are explicitly described at the beginning of each of those files.
 
diff --git a/src/Makevars b/src/Makevars
@@ -1,12 +1,12 @@
-PKG_CPPFLAGS=-Ivolesti/external -IlpSolve/src -Ivolesti/external/minimum_ellipsoid -Ivolesti/include -Ivolesti/include/convex_bodies/spectrahedra
+PKG_CPPFLAGS=-Ivolesti/external -Iexternal/lpSolve/src -Ivolesti/external/minimum_ellipsoid -Ivolesti/include -Ivolesti/include/convex_bodies/spectrahedra
 PKG_CXXFLAGS= -DBOOST_NO_AUTO_PTR -DDISABLE_NLP_ORACLES
 
-PKG_LIBS=-LlpSolve/src -llp_solve -Lvolesti/external/PackedCSparse/qd -lqd $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_LIBS=-Lexternal/lpSolve/src -llp_solve -Lvolesti/external/PackedCSparse/qd -lqd $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
-$(SHLIB): lpSolve/src/liblp_solve.a volesti/external/PackedCSparse/qd/libqd.a
+$(SHLIB): external/lpSolve/src/liblp_solve.a volesti/external/PackedCSparse/qd/libqd.a
 
-lpSolve/src/liblp_solve.a:
-	@(cd lpSolve/src && $(MAKE) liblp_solve.a \
+external/lpSolve/src/liblp_solve.a:
+	@(cd external/lpSolve/src && $(MAKE) liblp_solve.a \
     CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
     CPICFLAGS="$(CPICFLAGS)" AR="$(AR)" RANLIB="$(RANLIB)")
 

diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,12 +1,12 @@
-PKG_CPPFLAGS=-Ivolesti/external -IlpSolve/src -Ivolesti/external/minimum_ellipsoid -Ivolesti/include -Ivolesti/include/convex_bodies/spectrahedra
+PKG_CPPFLAGS=-Ivolesti/external -Iexternal/lpSolve/src -Ivolesti/external/minimum_ellipsoid -Ivolesti/include -Ivolesti/include/convex_bodies/spectrahedra
 PKG_CXXFLAGS= -lm -ldl -DBOOST_NO_AUTO_PTR -DDISABLE_NLP_ORACLES
 
-PKG_LIBS=-LlpSolve/src -llp_solve -Lvolesti/external/PackedCSparse/qd -lqd $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_LIBS=-Lexternal/lpSolve/src -llp_solve -Lvolesti/external/PackedCSparse/qd -lqd $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
-$(SHLIB): lpSolve/src/liblp_solve.a volesti/external/PackedCSparse/qd/libqd.a
+$(SHLIB): external/lpSolve/src/liblp_solve.a volesti/external/PackedCSparse/qd/libqd.a
 
-lpSolve/src/liblp_solve.a:
-	@(cd lpSolve/src && $(MAKE) liblp_solve.a \
+external/lpSolve/src/liblp_solve.a:
+	@(cd external/lpSolve/src && $(MAKE) liblp_solve.a \
     CC="$(CC)" CPPFLAGS="$(CPPFLAGS) -DUSRDLL -DINLINE=static" \
     CFLAGS="$(CFLAGS)" CPICFLAGS="$(CPICFLAGS)" AR="$(AR)" \
     RANLIB="$(RANLIB)")

diff --git a/src/lpSolve/src/Makefile → src/external/lpSolve/src/Makefile b/src/lpSolve/src/Makefile → src/external/lpSolve/src/Makefile
diff --git a/src/lpSolve/src/Makevars → src/external/lpSolve/src/Makevars b/src/lpSolve/src/Makevars → src/external/lpSolve/src/Makevars
diff --git a/src/lpSolve/src/Makevars.win → src/external/lpSolve/src/Makevars.win b/src/lpSolve/src/Makevars.win → src/external/lpSolve/src/Makevars.win
diff --git a/src/lpSolve/src/colamd.c → src/external/lpSolve/src/colamd.c b/src/lpSolve/src/colamd.c → src/external/lpSolve/src/colamd.c
diff --git a/src/lpSolve/src/colamd.h → src/external/lpSolve/src/colamd.h b/src/lpSolve/src/colamd.h → src/external/lpSolve/src/colamd.h
diff --git a/src/lpSolve/src/commonlib.c → src/external/lpSolve/src/commonlib.c b/src/lpSolve/src/commonlib.c → src/external/lpSolve/src/commonlib.c
diff --git a/src/lpSolve/src/commonlib.h → src/external/lpSolve/src/commonlib.h b/src/lpSolve/src/commonlib.h → src/external/lpSolve/src/commonlib.h
diff --git a/src/lpSolve/src/declare.h → src/external/lpSolve/src/declare.h b/src/lpSolve/src/declare.h → src/external/lpSolve/src/declare.h
diff --git a/src/lpSolve/src/fortify.h → src/external/lpSolve/src/fortify.h b/src/lpSolve/src/fortify.h → src/external/lpSolve/src/fortify.h
diff --git a/src/lpSolve/src/hbio.c → src/external/lpSolve/src/hbio.c b/src/lpSolve/src/hbio.c → src/external/lpSolve/src/hbio.c
@@ -1626,6 +1626,6 @@ void IOHBTerminate(char* message)
 {
 /*   fprintf(stderr,message);
 **   exit(1); */
-    error(message);
+  error("%s", message);
 }
 
diff --git a/src/lpSolve/src/hbio.h → src/external/lpSolve/src/hbio.h b/src/lpSolve/src/hbio.h → src/external/lpSolve/src/hbio.h
diff --git a/src/lpSolve/src/ini.c → src/external/lpSolve/src/ini.c b/src/lpSolve/src/ini.c → src/external/lpSolve/src/ini.c
diff --git a/src/lpSolve/src/ini.h → src/external/lpSolve/src/ini.h b/src/lpSolve/src/ini.h → src/external/lpSolve/src/ini.h
diff --git a/src/lpSolve/src/init.c → src/external/lpSolve/src/init.c b/src/lpSolve/src/init.c → src/external/lpSolve/src/init.c
diff --git a/src/lpSolve/src/isfixedvar.c → src/external/lpSolve/src/isfixedvar.c b/src/lpSolve/src/isfixedvar.c → src/external/lpSolve/src/isfixedvar.c
diff --git a/src/lpSolve/src/lp_BFP.h → src/external/lpSolve/src/lp_BFP.h b/src/lpSolve/src/lp_BFP.h → src/external/lpSolve/src/lp_BFP.h
diff --git a/src/lpSolve/src/lp_BFP1.h → src/external/lpSolve/src/lp_BFP1.h b/src/lpSolve/src/lp_BFP1.h → src/external/lpSolve/src/lp_BFP1.h
diff --git a/src/lpSolve/src/lp_BFP2.h → src/external/lpSolve/src/lp_BFP2.h b/src/lpSolve/src/lp_BFP2.h → src/external/lpSolve/src/lp_BFP2.h
diff --git a/src/lpSolve/src/lp_Hash.c → src/external/lpSolve/src/lp_Hash.c b/src/lpSolve/src/lp_Hash.c → src/external/lpSolve/src/lp_Hash.c
diff --git a/src/lpSolve/src/lp_Hash.h → src/external/lpSolve/src/lp_Hash.h b/src/lpSolve/src/lp_Hash.h → src/external/lpSolve/src/lp_Hash.h
diff --git a/src/lpSolve/src/lp_LUSOL.c → src/external/lpSolve/src/lp_LUSOL.c b/src/lpSolve/src/lp_LUSOL.c → src/external/lpSolve/src/lp_LUSOL.c
diff --git a/src/lpSolve/src/lp_LUSOL.h → src/external/lpSolve/src/lp_LUSOL.h b/src/lpSolve/src/lp_LUSOL.h → src/external/lpSolve/src/lp_LUSOL.h
diff --git a/src/lpSolve/src/lp_MDO.c → src/external/lpSolve/src/lp_MDO.c b/src/lpSolve/src/lp_MDO.c → src/external/lpSolve/src/lp_MDO.c
diff --git a/src/lpSolve/src/lp_MDO.h → src/external/lpSolve/src/lp_MDO.h b/src/lpSolve/src/lp_MDO.h → src/external/lpSolve/src/lp_MDO.h
diff --git a/src/lpSolve/src/lp_MPS.c → src/external/lpSolve/src/lp_MPS.c b/src/lpSolve/src/lp_MPS.c → src/external/lpSolve/src/lp_MPS.c
diff --git a/src/lpSolve/src/lp_MPS.h → src/external/lpSolve/src/lp_MPS.h b/src/lpSolve/src/lp_MPS.h → src/external/lpSolve/src/lp_MPS.h
diff --git a/src/lpSolve/src/lp_SOS.c → src/external/lpSolve/src/lp_SOS.c b/src/lpSolve/src/lp_SOS.c → src/external/lpSolve/src/lp_SOS.c
diff --git a/src/lpSolve/src/lp_SOS.h → src/external/lpSolve/src/lp_SOS.h b/src/lpSolve/src/lp_SOS.h → src/external/lpSolve/src/lp_SOS.h
diff --git a/src/lpSolve/src/lp_crash.c → src/external/lpSolve/src/lp_crash.c b/src/lpSolve/src/lp_crash.c → src/external/lpSolve/src/lp_crash.c
diff --git a/src/lpSolve/src/lp_crash.h → src/external/lpSolve/src/lp_crash.h b/src/lpSolve/src/lp_crash.h → src/external/lpSolve/src/lp_crash.h
diff --git a/src/lpSolve/src/lp_explicit.h → src/external/lpSolve/src/lp_explicit.h b/src/lpSolve/src/lp_explicit.h → src/external/lpSolve/src/lp_explicit.h
diff --git a/src/lpSolve/src/lp_fortify.h → src/external/lpSolve/src/lp_fortify.h b/src/lpSolve/src/lp_fortify.h → src/external/lpSolve/src/lp_fortify.h
diff --git a/src/lpSolve/src/lp_lib.c → src/external/lpSolve/src/lp_lib.c b/src/lpSolve/src/lp_lib.c → src/external/lpSolve/src/lp_lib.c
diff --git a/src/lpSolve/src/lp_lib.h → src/external/lpSolve/src/lp_lib.h b/src/lpSolve/src/lp_lib.h → src/external/lpSolve/src/lp_lib.h
diff --git a/src/lpSolve/src/lp_matrix.c → src/external/lpSolve/src/lp_matrix.c b/src/lpSolve/src/lp_matrix.c → src/external/lpSolve/src/lp_matrix.c
diff --git a/src/lpSolve/src/lp_matrix.h → src/external/lpSolve/src/lp_matrix.h b/src/lpSolve/src/lp_matrix.h → src/external/lpSolve/src/lp_matrix.h
diff --git a/src/lpSolve/src/lp_mipbb.c → src/external/lpSolve/src/lp_mipbb.c b/src/lpSolve/src/lp_mipbb.c → src/external/lpSolve/src/lp_mipbb.c
diff --git a/src/lpSolve/src/lp_mipbb.h → src/external/lpSolve/src/lp_mipbb.h b/src/lpSolve/src/lp_mipbb.h → src/external/lpSolve/src/lp_mipbb.h
diff --git a/src/lpSolve/src/lp_params.c → src/external/lpSolve/src/lp_params.c b/src/lpSolve/src/lp_params.c → src/external/lpSolve/src/lp_params.c
diff --git a/src/lpSolve/src/lp_presolve.c → src/external/lpSolve/src/lp_presolve.c b/src/lpSolve/src/lp_presolve.c → src/external/lpSolve/src/lp_presolve.c
diff --git a/src/lpSolve/src/lp_presolve.h → src/external/lpSolve/src/lp_presolve.h b/src/lpSolve/src/lp_presolve.h → src/external/lpSolve/src/lp_presolve.h
diff --git a/src/lpSolve/src/lp_price.c → src/external/lpSolve/src/lp_price.c b/src/lpSolve/src/lp_price.c → src/external/lpSolve/src/lp_price.c
diff --git a/src/lpSolve/src/lp_price.h → src/external/lpSolve/src/lp_price.h b/src/lpSolve/src/lp_price.h → src/external/lpSolve/src/lp_price.h
diff --git a/src/lpSolve/src/lp_pricePSE.c → src/external/lpSolve/src/lp_pricePSE.c b/src/lpSolve/src/lp_pricePSE.c → src/external/lpSolve/src/lp_pricePSE.c
diff --git a/src/lpSolve/src/lp_pricePSE.h → src/external/lpSolve/src/lp_pricePSE.h b/src/lpSolve/src/lp_pricePSE.h → src/external/lpSolve/src/lp_pricePSE.h
diff --git a/src/lpSolve/src/lp_report.c → src/external/lpSolve/src/lp_report.c b/src/lpSolve/src/lp_report.c → src/external/lpSolve/src/lp_report.c
diff --git a/src/lpSolve/src/lp_report.h → src/external/lpSolve/src/lp_report.h b/src/lpSolve/src/lp_report.h → src/external/lpSolve/src/lp_report.h
diff --git a/src/lpSolve/src/lp_rlp.c → src/external/lpSolve/src/lp_rlp.c b/src/lpSolve/src/lp_rlp.c → src/external/lpSolve/src/lp_rlp.c
diff --git a/src/lpSolve/src/lp_rlp.h → src/external/lpSolve/src/lp_rlp.h b/src/lpSolve/src/lp_rlp.h → src/external/lpSolve/src/lp_rlp.h
diff --git a/src/lpSolve/src/lp_scale.c → src/external/lpSolve/src/lp_scale.c b/src/lpSolve/src/lp_scale.c → src/external/lpSolve/src/lp_scale.c
diff --git a/src/lpSolve/src/lp_scale.h → src/external/lpSolve/src/lp_scale.h b/src/lpSolve/src/lp_scale.h → src/external/lpSolve/src/lp_scale.h
diff --git a/src/lpSolve/src/lp_simplex.c → src/external/lpSolve/src/lp_simplex.c b/src/lpSolve/src/lp_simplex.c → src/external/lpSolve/src/lp_simplex.c
diff --git a/src/lpSolve/src/lp_simplex.h → src/external/lpSolve/src/lp_simplex.h b/src/lpSolve/src/lp_simplex.h → src/external/lpSolve/src/lp_simplex.h
diff --git a/src/lpSolve/src/lp_types.h → src/external/lpSolve/src/lp_types.h b/src/lpSolve/src/lp_types.h → src/external/lpSolve/src/lp_types.h
diff --git a/src/lpSolve/src/lp_utils.c → src/external/lpSolve/src/lp_utils.c b/src/lpSolve/src/lp_utils.c → src/external/lpSolve/src/lp_utils.c
diff --git a/src/lpSolve/src/lp_utils.h → src/external/lpSolve/src/lp_utils.h b/src/lpSolve/src/lp_utils.h → src/external/lpSolve/src/lp_utils.h
diff --git a/src/lpSolve/src/lp_wlp.c → src/external/lpSolve/src/lp_wlp.c b/src/lpSolve/src/lp_wlp.c → src/external/lpSolve/src/lp_wlp.c
diff --git a/src/lpSolve/src/lp_wlp.h → src/external/lpSolve/src/lp_wlp.h b/src/lpSolve/src/lp_wlp.h → src/external/lpSolve/src/lp_wlp.h
diff --git a/src/lpSolve/src/lpkit.h → src/external/lpSolve/src/lpkit.h b/src/lpSolve/src/lpkit.h → src/external/lpSolve/src/lpkit.h
diff --git a/src/lpSolve/src/lpslink56.c → src/external/lpSolve/src/lpslink56.c b/src/lpSolve/src/lpslink56.c → src/external/lpSolve/src/lpslink56.c
diff --git a/src/lpSolve/src/lpsolve.h → src/external/lpSolve/src/lpsolve.h b/src/lpSolve/src/lpsolve.h → src/external/lpSolve/src/lpsolve.h
diff --git a/src/lpSolve/src/lusol.c → src/external/lpSolve/src/lusol.c b/src/lpSolve/src/lusol.c → src/external/lpSolve/src/lusol.c
diff --git a/src/lpSolve/src/lusol.h → src/external/lpSolve/src/lusol.h b/src/lpSolve/src/lusol.h → src/external/lpSolve/src/lusol.h
diff --git a/src/lpSolve/src/lusol1.h → src/external/lpSolve/src/lusol1.h b/src/lpSolve/src/lusol1.h → src/external/lpSolve/src/lusol1.h
diff --git a/src/lpSolve/src/lusol2.h → src/external/lpSolve/src/lusol2.h b/src/lpSolve/src/lusol2.h → src/external/lpSolve/src/lusol2.h
diff --git a/src/lpSolve/src/lusol6a.h → src/external/lpSolve/src/lusol6a.h b/src/lpSolve/src/lusol6a.h → src/external/lpSolve/src/lusol6a.h
diff --git a/src/lpSolve/src/lusol6l0.h → src/external/lpSolve/src/lusol6l0.h b/src/lpSolve/src/lusol6l0.h → src/external/lpSolve/src/lusol6l0.h
diff --git a/src/lpSolve/src/lusol6u.h → src/external/lpSolve/src/lusol6u.h b/src/lpSolve/src/lusol6u.h → src/external/lpSolve/src/lusol6u.h
diff --git a/src/lpSolve/src/lusol7a.h → src/external/lpSolve/src/lusol7a.h b/src/lpSolve/src/lusol7a.h → src/external/lpSolve/src/lusol7a.h
diff --git a/src/lpSolve/src/lusol8a.h → src/external/lpSolve/src/lusol8a.h b/src/lpSolve/src/lusol8a.h → src/external/lpSolve/src/lusol8a.h
diff --git a/src/lpSolve/src/lusolio.c → src/external/lpSolve/src/lusolio.c b/src/lpSolve/src/lusolio.c → src/external/lpSolve/src/lusolio.c
diff --git a/src/lpSolve/src/lusolio.h → src/external/lpSolve/src/lusolio.h b/src/lpSolve/src/lusolio.h → src/external/lpSolve/src/lusolio.h
diff --git a/src/lpSolve/src/mmio.c → src/external/lpSolve/src/mmio.c b/src/lpSolve/src/mmio.c → src/external/lpSolve/src/mmio.c
diff --git a/src/lpSolve/src/mmio.h → src/external/lpSolve/src/mmio.h b/src/lpSolve/src/mmio.h → src/external/lpSolve/src/mmio.h
diff --git a/src/lpSolve/src/myblas.c → src/external/lpSolve/src/myblas.c b/src/lpSolve/src/myblas.c → src/external/lpSolve/src/myblas.c
diff --git a/src/lpSolve/src/myblas.h → src/external/lpSolve/src/myblas.h b/src/lpSolve/src/myblas.h → src/external/lpSolve/src/myblas.h
diff --git a/src/lpSolve/src/sparselib.c → src/external/lpSolve/src/sparselib.c b/src/lpSolve/src/sparselib.c → src/external/lpSolve/src/sparselib.c
diff --git a/src/lpSolve/src/sparselib.h → src/external/lpSolve/src/sparselib.h b/src/lpSolve/src/sparselib.h → src/external/lpSolve/src/sparselib.h
diff --git a/src/lpSolve/src/ufortify.h → src/external/lpSolve/src/ufortify.h b/src/lpSolve/src/ufortify.h → src/external/lpSolve/src/ufortify.h
diff --git a/src/lpSolve/src/yacc_read.c → src/external/lpSolve/src/yacc_read.c b/src/lpSolve/src/yacc_read.c → src/external/lpSolve/src/yacc_read.c
diff --git a/src/lpSolve/src/yacc_read.h → src/external/lpSolve/src/yacc_read.h b/src/lpSolve/src/yacc_read.h → src/external/lpSolve/src/yacc_read.h
diff --git a/src/lpSolve_patches/commonlib.c → src/external/lpSolve_patches/commonlib.c b/src/lpSolve_patches/commonlib.c → src/external/lpSolve_patches/commonlib.c
diff --git a/src/lpSolve/DESCRIPTION b/src/lpSolve/DESCRIPTION
diff --git a/src/lpSolve/MD5 b/src/lpSolve/MD5
diff --git a/src/lpSolve/NAMESPACE b/src/lpSolve/NAMESPACE