Skip to content
Snippets Groups Projects
Commit ec9974fb authored by Mayo's avatar Mayo
Browse files

Version 1.5.0;Fixed deprecated autoconf macros;Updated invalid URLs;Removed... 

Version 1.5.0;Fixed deprecated autoconf macros;Updated invalid URLs;Removed deprecated functions;Added new function;Adaption of Makevars.win to work with CPLEX 20.1.0
parent 769ea42d
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 8040 additions and 43 deletions
DESCRIPTION
+ 4
− 4
View file @ ec9974fb
Package: cplexAPI
Type: Package
Title: R Interface to C API of IBM ILOG CPLEX
Version: 1.4.1
Date: 2020-09-22
Version: 1.5.0
Date: 2021-10-29
Authors@R: c(person("Mayo", "Roettger", role = "cre", email = "mayo.roettger@hhu.de"),
person("Gabriel", "Gelius-Dietrich", role = "aut", email = "geliudie@uni-duesseldorf.de"),
person(c("C.", "Jonathan"), "Fritzemeier", role = c("ctb"), email = "clausjonathan.fritzemeier@uni-duesseldorf.de"))
......@@ -14,7 +14,7 @@ License: GPL-3 | file LICENSE
LazyLoad: yes
Collate: generics.R cplexConst.R cplexErrorClass.R cplexPtrClass.R
cplex.R cplexAPI.R cplex_checkAPI.R cplex_longparamAPI.R zzz.R
Packaged: 2020-09-22 08:36:00 UTC; mayo
Packaged: 2021-10-29 16:36:00 UTC; mayo
NeedsCompilation: yes
Repository: CRAN
Date/Publication: 2020-09-22 10:36:00
Date/Publication: 2021-10-29 18:36:00
NAMESPACE
+ 10
− 4
View file @ ec9974fb
......@@ -190,10 +190,7 @@ readCopyMIPstartsCPLEX,
readCopyOrderCPLEX,
readCopyParmCPLEX,
readCopyProbCPLEX,
readCopySolCPLEX,
refineConflictCPLEX,
refineConflictExtCPLEX,
refineMIPstartConflictCPLEX,
refineMIPstartConflictExtCPLEX,
return_codeCPLEX,
rhsSaCPLEX,
......@@ -923,7 +920,16 @@ CPXPARAM_MultiObjective_Display,
CPXPARAM_ParamDisplay,
CPXPARAM_Preprocessing_Folding,
CPXPARAM_Read_WarningLimit,
getParmHierNameCPLEX
getParmHierNameCPLEX,
# new in CPLEX 12.9.0 end
# removed in CPLEX >= 20.1.0 (dummy) begin
readCopySolCPLEX,
refineConflictCPLEX,
refineMIPstartConflictCPLEX,
# removed in CPLEX >= 20.1.0 (dummy) end
# new in CPLEX 20.1.0 begin
readCopyStartInfoCPLEX
# new in CPLEX 20.1.0 end
)
R/cplexAPI.R
+ 24
− 0
View file @ ec9974fb
......@@ -2030,6 +2030,7 @@ getRowInfeasCPLEX <- function(env, lp, begin, end, sol = NULL) {
}
# removed in CPLEX >= 20.1.0 (dummy) begin
#------------------------------------------------------------------------------#
refineConflictCPLEX <- function(env, lp) {
......@@ -2041,6 +2042,7 @@ refineConflictCPLEX <- function(env, lp) {
return(cplexError(rcconf))
}
# removed in CPLEX >= 20.1.0 (dummy) end
#------------------------------------------------------------------------------#
......@@ -2225,6 +2227,7 @@ solWriteCPLEX <- function(env, lp, fname) {
}
# removed in CPLEX >= 20.1.0 (dummy) begin
#------------------------------------------------------------------------------#
readCopySolCPLEX <- function(env, lp, fname) {
......@@ -2237,6 +2240,7 @@ readCopySolCPLEX <- function(env, lp, fname) {
return(status)
}
# removed in CPLEX >= 20.1.0 (dummy) end
#------------------------------------------------------------------------------#
......@@ -2893,6 +2897,7 @@ getMIPstartIndexCPLEX <- function(env, lp, iname) {
}
# removed in CPLEX >= 20.1.0 (dummy) begin
#------------------------------------------------------------------------------#
refineMIPstartConflictCPLEX <- function(env, lp, mipstartindex) {
......@@ -2905,6 +2910,7 @@ refineMIPstartConflictCPLEX <- function(env, lp, mipstartindex) {
return(cplexError(rcconf))
}
# removed in CPLEX >= 20.1.0 (dummy) end
#------------------------------------------------------------------------------#
......@@ -3263,3 +3269,21 @@ getParmHierNameCPLEX <- function(env, whichparam) {
return(value)
}
# new in CPLEX 12.9.0 end
# new in CPLEX >= 20.1.0 begin
#------------------------------------------------------------------------------#
readCopyStartInfoCPLEX <- function(env, lp, fname) {
status <- .Call("readCopyStartInfo", PACKAGE = "cplexAPI",
cplexPointer(env),
cplexPointer(lp),
as.character(fname)
)
return(status)
}
# new in CPLEX >= 20.1.0 end
#------------------------------------------------------------------------------#
autom4te.cache/output.0 0 → 100644
+ 6323
− 0
View file @ ec9974fb
This diff is collapsed.
autom4te.cache/requests 0 → 100644
+ 78
− 0
View file @ ec9974fb
# This file was generated by Autom4te Sun Aug 20 18:29:13 UTC 2017.
# It contains the lists of macros which have been traced.
# It can be safely removed.
@request = (
bless( [
'0',
1,
[
'/usr/share/autoconf'
],
[
'/usr/share/autoconf/autoconf/autoconf.m4f',
'configure.ac'
],
{
'AM_PATH_GUILE' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'AC_CANONICAL_HOST' => 1,
'_AM_COND_ENDIF' => 1,
'LT_INIT' => 1,
'AM_MAINTAINER_MODE' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_PROG_F77_C_O' => 1,
'LT_SUPPORTED_TAG' => 1,
'AM_INIT_AUTOMAKE' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AM_POT_TOOLS' => 1,
'AM_PROG_LIBTOOL' => 1,
'AC_CONFIG_LINKS' => 1,
'AC_CONFIG_HEADERS' => 1,
'AM_CONDITIONAL' => 1,
'AM_PROG_AR' => 1,
'AM_XGETTEXT_OPTION' => 1,
'AC_INIT' => 1,
'AM_PROG_CXX_C_O' => 1,
'AC_FC_PP_DEFINE' => 1,
'AH_OUTPUT' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_SUBST' => 1,
'AC_SUBST_TRACE' => 1,
'include' => 1,
'm4_pattern_allow' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'sinclude' => 1,
'_AM_COND_IF' => 1,
'AC_FC_PP_SRCEXT' => 1,
'_m4_warn' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AM_SILENT_RULES' => 1,
'AC_CONFIG_FILES' => 1,
'AM_PROG_MOC' => 1,
'AC_FC_SRCEXT' => 1,
'm4_sinclude' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AC_LIBSOURCE' => 1,
'AM_ENABLE_MULTILIB' => 1,
'AM_PROG_FC_C_O' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'm4_include' => 1,
'AC_CANONICAL_TARGET' => 1,
'm4_pattern_forbid' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AM_NLS' => 1,
'AM_GNU_GETTEXT' => 1,
'_LT_AC_TAGCONFIG' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
'AC_CANONICAL_BUILD' => 1,
'_AM_COND_ELSE' => 1,
'AC_FC_FREEFORM' => 1,
'_AM_MAKEFILE_INCLUDE' => 1
}
], 'Autom4te::Request' )
);
autom4te.cache/traces.0 0 → 100644
+ 278
− 0
View file @ ec9974fb
m4trace:configure.ac:1: -1- AC_INIT([cplexAPI], [1.5.0], [mayo.roettger@hhu.de])
m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.ac:1: -1- m4_pattern_forbid([_AC_])
m4trace:configure.ac:1: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
m4trace:configure.ac:1: -1- m4_pattern_allow([^AS_FLAGS$])
m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?m4_])
m4trace:configure.ac:1: -1- m4_pattern_forbid([^dnl$])
m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?AS_])
m4trace:configure.ac:1: -1- AC_SUBST([SHELL])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([SHELL])
m4trace:configure.ac:1: -1- m4_pattern_allow([^SHELL$])
m4trace:configure.ac:1: -1- AC_SUBST([PATH_SEPARATOR])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PATH_SEPARATOR$])
m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_NAME])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_NAME$])
m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_VERSION$])
m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_STRING])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_STRING$])
m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_URL], [m4_ifdef([AC_PACKAGE_URL], ['AC_PACKAGE_URL'])])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_URL])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_URL$])
m4trace:configure.ac:1: -1- AC_SUBST([exec_prefix], [NONE])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([exec_prefix])
m4trace:configure.ac:1: -1- m4_pattern_allow([^exec_prefix$])
m4trace:configure.ac:1: -1- AC_SUBST([prefix], [NONE])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([prefix])
m4trace:configure.ac:1: -1- m4_pattern_allow([^prefix$])
m4trace:configure.ac:1: -1- AC_SUBST([program_transform_name], [s,x,x,])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([program_transform_name])
m4trace:configure.ac:1: -1- m4_pattern_allow([^program_transform_name$])
m4trace:configure.ac:1: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([bindir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^bindir$])
m4trace:configure.ac:1: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([sbindir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^sbindir$])
m4trace:configure.ac:1: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([libexecdir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^libexecdir$])
m4trace:configure.ac:1: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([datarootdir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^datarootdir$])
m4trace:configure.ac:1: -1- AC_SUBST([datadir], ['${datarootdir}'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([datadir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^datadir$])
m4trace:configure.ac:1: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([sysconfdir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^sysconfdir$])
m4trace:configure.ac:1: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([sharedstatedir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^sharedstatedir$])
m4trace:configure.ac:1: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([localstatedir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^localstatedir$])
m4trace:configure.ac:1: -1- AC_SUBST([runstatedir], ['${localstatedir}/run'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([runstatedir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^runstatedir$])
m4trace:configure.ac:1: -1- AC_SUBST([includedir], ['${prefix}/include'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([includedir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^includedir$])
m4trace:configure.ac:1: -1- AC_SUBST([oldincludedir], ['/usr/include'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([oldincludedir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^oldincludedir$])
m4trace:configure.ac:1: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
['${datarootdir}/doc/${PACKAGE_TARNAME}'],
['${datarootdir}/doc/${PACKAGE}'])])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([docdir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^docdir$])
m4trace:configure.ac:1: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([infodir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^infodir$])
m4trace:configure.ac:1: -1- AC_SUBST([htmldir], ['${docdir}'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([htmldir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^htmldir$])
m4trace:configure.ac:1: -1- AC_SUBST([dvidir], ['${docdir}'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([dvidir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^dvidir$])
m4trace:configure.ac:1: -1- AC_SUBST([pdfdir], ['${docdir}'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([pdfdir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^pdfdir$])
m4trace:configure.ac:1: -1- AC_SUBST([psdir], ['${docdir}'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([psdir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^psdir$])
m4trace:configure.ac:1: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([libdir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^libdir$])
m4trace:configure.ac:1: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([localedir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^localedir$])
m4trace:configure.ac:1: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([mandir])
m4trace:configure.ac:1: -1- m4_pattern_allow([^mandir$])
m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_NAME$])
m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
@%:@undef PACKAGE_NAME])
m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
@%:@undef PACKAGE_TARNAME])
m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_VERSION$])
m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
@%:@undef PACKAGE_VERSION])
m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_STRING$])
m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
@%:@undef PACKAGE_STRING])
m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
@%:@undef PACKAGE_BUGREPORT])
m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL])
m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_URL$])
m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home page for this package. */
@%:@undef PACKAGE_URL])
m4trace:configure.ac:1: -1- AC_SUBST([DEFS])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([DEFS])
m4trace:configure.ac:1: -1- m4_pattern_allow([^DEFS$])
m4trace:configure.ac:1: -1- AC_SUBST([ECHO_C])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([ECHO_C])
m4trace:configure.ac:1: -1- m4_pattern_allow([^ECHO_C$])
m4trace:configure.ac:1: -1- AC_SUBST([ECHO_N])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([ECHO_N])
m4trace:configure.ac:1: -1- m4_pattern_allow([^ECHO_N$])
m4trace:configure.ac:1: -1- AC_SUBST([ECHO_T])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([ECHO_T])
m4trace:configure.ac:1: -1- m4_pattern_allow([^ECHO_T$])
m4trace:configure.ac:1: -1- AC_SUBST([LIBS])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([LIBS])
m4trace:configure.ac:1: -1- m4_pattern_allow([^LIBS$])
m4trace:configure.ac:1: -1- AC_SUBST([build_alias])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([build_alias])
m4trace:configure.ac:1: -1- m4_pattern_allow([^build_alias$])
m4trace:configure.ac:1: -1- AC_SUBST([host_alias])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([host_alias])
m4trace:configure.ac:1: -1- m4_pattern_allow([^host_alias$])
m4trace:configure.ac:1: -1- AC_SUBST([target_alias])
m4trace:configure.ac:1: -1- AC_SUBST_TRACE([target_alias])
m4trace:configure.ac:1: -1- m4_pattern_allow([^target_alias$])
m4trace:configure.ac:29: -1- AC_SUBST([CC])
m4trace:configure.ac:29: -1- AC_SUBST_TRACE([CC])
m4trace:configure.ac:29: -1- m4_pattern_allow([^CC$])
m4trace:configure.ac:29: -1- AC_SUBST([CFLAGS])
m4trace:configure.ac:29: -1- AC_SUBST_TRACE([CFLAGS])
m4trace:configure.ac:29: -1- m4_pattern_allow([^CFLAGS$])
m4trace:configure.ac:29: -1- AC_SUBST([LDFLAGS])
m4trace:configure.ac:29: -1- AC_SUBST_TRACE([LDFLAGS])
m4trace:configure.ac:29: -1- m4_pattern_allow([^LDFLAGS$])
m4trace:configure.ac:29: -1- AC_SUBST([LIBS])
m4trace:configure.ac:29: -1- AC_SUBST_TRACE([LIBS])
m4trace:configure.ac:29: -1- m4_pattern_allow([^LIBS$])
m4trace:configure.ac:29: -1- AC_SUBST([CPPFLAGS])
m4trace:configure.ac:29: -1- AC_SUBST_TRACE([CPPFLAGS])
m4trace:configure.ac:29: -1- m4_pattern_allow([^CPPFLAGS$])
m4trace:configure.ac:29: -1- AC_SUBST([CC])
m4trace:configure.ac:29: -1- AC_SUBST_TRACE([CC])
m4trace:configure.ac:29: -1- m4_pattern_allow([^CC$])
m4trace:configure.ac:29: -1- AC_SUBST([CC])
m4trace:configure.ac:29: -1- AC_SUBST_TRACE([CC])
m4trace:configure.ac:29: -1- m4_pattern_allow([^CC$])
m4trace:configure.ac:29: -1- AC_SUBST([CC])
m4trace:configure.ac:29: -1- AC_SUBST_TRACE([CC])
m4trace:configure.ac:29: -1- m4_pattern_allow([^CC$])
m4trace:configure.ac:29: -1- AC_SUBST([CC])
m4trace:configure.ac:29: -1- AC_SUBST_TRACE([CC])
m4trace:configure.ac:29: -1- m4_pattern_allow([^CC$])
m4trace:configure.ac:29: -1- AC_SUBST([ac_ct_CC])
m4trace:configure.ac:29: -1- AC_SUBST_TRACE([ac_ct_CC])
m4trace:configure.ac:29: -1- m4_pattern_allow([^ac_ct_CC$])
m4trace:configure.ac:29: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
m4trace:configure.ac:29: -1- AC_SUBST_TRACE([EXEEXT])
m4trace:configure.ac:29: -1- m4_pattern_allow([^EXEEXT$])
m4trace:configure.ac:29: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
m4trace:configure.ac:29: -1- AC_SUBST_TRACE([OBJEXT])
m4trace:configure.ac:29: -1- m4_pattern_allow([^OBJEXT$])
m4trace:configure.ac:30: -1- AC_SUBST([CPP])
m4trace:configure.ac:30: -1- AC_SUBST_TRACE([CPP])
m4trace:configure.ac:30: -1- m4_pattern_allow([^CPP$])
m4trace:configure.ac:30: -1- AC_SUBST([CPPFLAGS])
m4trace:configure.ac:30: -1- AC_SUBST_TRACE([CPPFLAGS])
m4trace:configure.ac:30: -1- m4_pattern_allow([^CPPFLAGS$])
m4trace:configure.ac:30: -1- AC_SUBST([CPP])
m4trace:configure.ac:30: -1- AC_SUBST_TRACE([CPP])
m4trace:configure.ac:30: -1- m4_pattern_allow([^CPP$])
m4trace:configure.ac:37: -1- AC_CONFIG_HEADERS([src/config.h])
m4trace:configure.ac:151: -1- AC_SUBST([CPLEX_BIN])
m4trace:configure.ac:151: -1- AC_SUBST_TRACE([CPLEX_BIN])
m4trace:configure.ac:151: -1- m4_pattern_allow([^CPLEX_BIN$])
m4trace:configure.ac:155: -1- AC_SUBST([AWK])
m4trace:configure.ac:155: -1- AC_SUBST_TRACE([AWK])
m4trace:configure.ac:155: -1- m4_pattern_allow([^AWK$])
m4trace:configure.ac:179: -1- AC_SUBST([AWK])
m4trace:configure.ac:179: -1- AC_SUBST_TRACE([AWK])
m4trace:configure.ac:179: -1- m4_pattern_allow([^AWK$])
m4trace:configure.ac:268: -1- AC_DEFINE_TRACE_LITERAL([USE_CHECK])
m4trace:configure.ac:268: -1- m4_pattern_allow([^USE_CHECK$])
m4trace:configure.ac:268: -1- AH_OUTPUT([USE_CHECK], [/* defined, if check.c can be used */
@%:@undef USE_CHECK])
m4trace:configure.ac:288: -1- AC_SUBST([GREP])
m4trace:configure.ac:288: -1- AC_SUBST_TRACE([GREP])
m4trace:configure.ac:288: -1- m4_pattern_allow([^GREP$])
m4trace:configure.ac:288: -1- AC_SUBST([EGREP])
m4trace:configure.ac:288: -1- AC_SUBST_TRACE([EGREP])
m4trace:configure.ac:288: -1- m4_pattern_allow([^EGREP$])
m4trace:configure.ac:288: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
m4trace:configure.ac:288: -1- m4_pattern_allow([^STDC_HEADERS$])
m4trace:configure.ac:288: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
@%:@undef STDC_HEADERS])
m4trace:configure.ac:288: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
@%:@undef HAVE_SYS_TYPES_H])
m4trace:configure.ac:288: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
@%:@undef HAVE_SYS_STAT_H])
m4trace:configure.ac:288: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
@%:@undef HAVE_STDLIB_H])
m4trace:configure.ac:288: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
@%:@undef HAVE_STRING_H])
m4trace:configure.ac:288: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
@%:@undef HAVE_MEMORY_H])
m4trace:configure.ac:288: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
@%:@undef HAVE_STRINGS_H])
m4trace:configure.ac:288: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
@%:@undef HAVE_INTTYPES_H])
m4trace:configure.ac:288: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
@%:@undef HAVE_STDINT_H])
m4trace:configure.ac:288: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
@%:@undef HAVE_UNISTD_H])
m4trace:configure.ac:303: -1- AC_SUBST([PKG_CFLAGS])
m4trace:configure.ac:303: -1- AC_SUBST_TRACE([PKG_CFLAGS])
m4trace:configure.ac:303: -1- m4_pattern_allow([^PKG_CFLAGS$])
m4trace:configure.ac:304: -1- AC_SUBST([PKG_LIBS])
m4trace:configure.ac:304: -1- AC_SUBST_TRACE([PKG_LIBS])
m4trace:configure.ac:304: -1- m4_pattern_allow([^PKG_LIBS$])
m4trace:configure.ac:305: -1- AC_SUBST([PKG_CPPFLAGS])
m4trace:configure.ac:305: -1- AC_SUBST_TRACE([PKG_CPPFLAGS])
m4trace:configure.ac:305: -1- m4_pattern_allow([^PKG_CPPFLAGS$])
m4trace:configure.ac:306: -1- AC_CONFIG_FILES([src/Makevars])
m4trace:configure.ac:307: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
m4trace:configure.ac:307: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
m4trace:configure.ac:307: -1- m4_pattern_allow([^LIB@&t@OBJS$])
m4trace:configure.ac:307: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
m4trace:configure.ac:307: -1- AC_SUBST_TRACE([LTLIBOBJS])
m4trace:configure.ac:307: -1- m4_pattern_allow([^LTLIBOBJS$])
m4trace:configure.ac:307: -1- AC_SUBST_TRACE([top_builddir])
m4trace:configure.ac:307: -1- AC_SUBST_TRACE([top_build_prefix])
m4trace:configure.ac:307: -1- AC_SUBST_TRACE([srcdir])
m4trace:configure.ac:307: -1- AC_SUBST_TRACE([abs_srcdir])
m4trace:configure.ac:307: -1- AC_SUBST_TRACE([top_srcdir])
m4trace:configure.ac:307: -1- AC_SUBST_TRACE([abs_top_srcdir])
m4trace:configure.ac:307: -1- AC_SUBST_TRACE([builddir])
m4trace:configure.ac:307: -1- AC_SUBST_TRACE([abs_builddir])
m4trace:configure.ac:307: -1- AC_SUBST_TRACE([abs_top_builddir])
m4trace:configure.ac:309: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
m4trace:configure.ac:309: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
m4trace:configure.ac:309: -1- m4_pattern_allow([^LIB@&t@OBJS$])
m4trace:configure.ac:309: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
m4trace:configure.ac:309: -1- AC_SUBST_TRACE([LTLIBOBJS])
m4trace:configure.ac:309: -1- m4_pattern_allow([^LTLIBOBJS$])
m4trace:configure.ac:309: -1- AC_SUBST_TRACE([top_builddir])
m4trace:configure.ac:309: -1- AC_SUBST_TRACE([top_build_prefix])
m4trace:configure.ac:309: -1- AC_SUBST_TRACE([srcdir])
m4trace:configure.ac:309: -1- AC_SUBST_TRACE([abs_srcdir])
m4trace:configure.ac:309: -1- AC_SUBST_TRACE([top_srcdir])
m4trace:configure.ac:309: -1- AC_SUBST_TRACE([abs_top_srcdir])
m4trace:configure.ac:309: -1- AC_SUBST_TRACE([builddir])
m4trace:configure.ac:309: -1- AC_SUBST_TRACE([abs_builddir])
m4trace:configure.ac:309: -1- AC_SUBST_TRACE([abs_top_builddir])
configure
+ 1282
− 9
View file @ ec9974fb
This diff is collapsed.
configure.ac
+ 9
− 11
View file @ ec9974fb
AC_INIT([cplexAPI], [1.4.1], [mayo.roettger@hhu.de])
AC_INIT([cplexAPI],[1.5.0],[mayo.roettger@hhu.de])
## adopted from configure.ac in Rcplex_0.3-0
......@@ -57,16 +57,14 @@ dnl # get arguments
dnl # --------------------------------------------------------------------
AC_ARG_WITH(cplex-include,
AC_HELP_STRING([--with-cplex-include=PATH],
[location of CPLEX include directory]
),
AS_HELP_STRING([--with-cplex-include=PATH],[location of CPLEX include directory
]),
[CPLEX_INCLUDE=$withval],
[CPLEX_INCLUDE=""])
AC_ARG_WITH(cplex-lib,
AC_HELP_STRING([--with-cplex-lib=PATH],
[location of CPLEX callable library]
),
AS_HELP_STRING([--with-cplex-lib=PATH],[location of CPLEX callable library
]),
[CPLEX_LIB=$withval],
[CPLEX_LIB=""])
......@@ -93,9 +91,8 @@ AC_ARG_WITH(cplex-dir,
dnl # CPLEX file check.c for debugging
AC_ARG_WITH(cplex-check,
AC_HELP_STRING([--with-cplex-check=PATH],
[location of CPLEX file check.c]
),
AS_HELP_STRING([--with-cplex-check=PATH],[location of CPLEX file check.c
]),
[CPLEX_CHECK=$withval],
[CPLEX_CHECK=""])
......@@ -308,6 +305,7 @@ AC_SUBST(PKG_LIBS)
AC_SUBST(PKG_CPPFLAGS)
AC_CONFIG_FILES(src/Makevars)
AC_OUTPUT
dnl # removed deprecated: AC_OUTPUT(src/Makevars)
dnl # removed deprecated: AC_CONFIG_FILES([src/Makevars])
AC_OUTPUT
exit 0
inst/INSTALL
+ 3
− 3
View file @ ec9974fb
......@@ -99,13 +99,13 @@ For the installation on Windows systems the file Makewars.win in src/ is
required. The file looks like this:
PKG_CPPFLAGS=-g -D_R_=1 -DUSE_R=1 -I"${CPLEX_STUDIO_DIR}\cplex\include"
PKG_LIBS=-L"${CPLEX_STUDIO_LIB}" -lm -lcplex12100
PKG_LIBS=-L"${CPLEX_STUDIO_LIB}" -lm -lcplex2010
with the environment variable CPLEX_STUDIO_DIR being the installation directory
of CPLEX and CPLEX_STUDIO_LIB being the library directory of CPLEX (for example
C:/PROGRA~1/IBM/ILOG/CPLEX_Studio128/cplex/bin/x64_win64).
C:/PROGRA~1/IBM/ILOG/CPLEX_Studio1210/cplex/bin/x64_win64).
This procedure was tested successfully with IBM ILOG CPLEX 12.10
This procedure was tested successfully with IBM ILOG CPLEX 20.1.0
on 64-bit Windows 10 using Rtools 3.5.
......
inst/NEWS.Rd
+ 13
− 2
View file @ ec9974fb
......@@ -3,6 +3,17 @@
\name{NEWS}
\title{cplexAPI News}
\encoding{UTF-8}
% ---------------------------------------------------------------------------- %
\section{Changes in version 1.5.0 2020-10-29}{
\itemize{
\item Fix for CRAN issue concerning deprecated autoconf macros.
\item Updated invalid URLs.
\item Removed functions \code{readCopySolCPLEX}, \code{refineConflictCPLEX}, and \code{refineMipStartConflict}, because corresponding functions \code{CPXreadcopysol}, \code{CPXrefineconflictcplex}, and \code{CPXrefinemipstartconflict} were deprecated in Version >= 20.1.0.
\item Added function \code{readCopyStartInfoCPLEX} if building package with CPLEX Version >= 20.1.0.
\item Adaptation of Makevars.win to work with CPLEX version 20.1.0.
}
}
% ---------------------------------------------------------------------------- %
\section{Changes in version 1.4.1 2020-09-22}{
\itemize{
......@@ -22,7 +33,7 @@
\item Adaptation of configure script to extract correct linker options from example Makefile in CPLEX versions >= 10.9.0,
if neither environment variables PKG_CPPFLAGS and PKG_LIBS, nor configure arguments --with-cplex-include and --with-cplex-lib are given,
and option --with-cplex-dir was given or the respective directory could be extracted from the path variable.
\item Adaptation of configure script to allow more flexibitlity in specifying the CPLEX installation directory with option --with-cplex-dir.
\item Adaptation of configure script to allow more flexibility in specifying the CPLEX installation directory with option --with-cplex-dir.
\item Adaptation of Makevars.win to work with CPLEX version 12.10.0.
\item According to a comment from Daniel Junglas, CPLEX functions \code{CPXinitialize} and \code{CPXfinalize} should be called when the
shared library is loaded and unloaded to prevent subtle bugs. \code{CPXinitialize} is now called within cplexAPI's \code{.onload()} hook.
......@@ -67,7 +78,7 @@
\section{Changes in version 1.3.3 2017-01-18}{
\itemize{
\item In CPLEX Version 1270 are the functions \code{CPXaddchannel} and
\code{CPXdelchannel} removed (\url{http://www.ibm.com/support/knowledgecenter/SSSA5P_12.7.0/ilog.odms.cplex.help/CPLEX/ReleaseNotes/topics/releasenotes127/removed.html}).
\code{CPXdelchannel} removed.).
}
}
......
inst/c2r.map
+ 7
− 1
View file @ ec9974fb
......@@ -185,10 +185,12 @@ CPXreadcopymipstarts <- cplexAPI::readCopyMIPstartsCPLEX
CPXreadcopyorder <- cplexAPI::readCopyOrderCPLEX
CPXreadcopyparam <- cplexAPI::readCopyParmCPLEX
CPXreadcopyprob <- cplexAPI::readCopyProbCPLEX
# removed in CPLEX >= 20.1.0 (dummy) begin
CPXreadcopysol <- cplexAPI::readCopySolCPLEX
CPXrefineconflict <- cplexAPI::refineConflictCPLEX
CPXrefineconflictext <- cplexAPI::refineConflictExtCPLEX
CPXrefinemipstartconflict <- cplexAPI::refineMIPstartConflictCPLEX
# removed in CPLEX >= 20.1.0 (dummy) end
CPXrefineconflictext <- cplexAPI::refineConflictExtCPLEX
CPXrefinemipstartconflictext <- cplexAPI::refineMIPstartConflictExtCPLEX
CPXrhssa <- cplexAPI::rhsSaCPLEX
CPXsetdblparam <- cplexAPI::setDblParmCPLEX
......@@ -219,3 +221,7 @@ CPXgetlogfilename <- cplexAPI::getLogFileNameCPLEX
# new in CPLEX 12.9.0 begin
CPXgetparamhiername <- cplexAPI::getParmHierNameCPLEX
# new in CPLEX 12.9.0 end
# new in CPLEX >= 20.1.0 begin
CPXreadcopystartinfo <- cplexAPI::readCopyStartInfoCPLEX
# new in CPLEX >= 20.1.0 end
man/addColsCPLEX.Rd
+ 1
− 1
View file @ ec9974fb
......@@ -71,7 +71,7 @@
\references{
The IBM ILOG CPLEX home page at
\url{https://www.ibm.com/support/knowledgecenter/SSSA5P}.
\url{https://www.ibm.com/docs/en}.
}
\author{
......
man/addFpDestCPLEX.Rd
+ 1
− 1
View file @ ec9974fb
......@@ -44,7 +44,7 @@
\references{
The IBM ILOG CPLEX home page at
\url{https://www.ibm.com/support/knowledgecenter/SSSA5P}.
\url{https://www.ibm.com/docs/en}.
}
\author{
......
man/addIndConstrCPLEX.Rd
+ 1
− 1
View file @ ec9974fb
......@@ -65,7 +65,7 @@
\references{
The IBM ILOG CPLEX home page at
\url{https://www.ibm.com/support/knowledgecenter/SSSA5P}.
\url{https://www.ibm.com/docs/en}.
}
\author{
......
man/addMIPstartsCPLEX.Rd
+ 1
− 1
View file @ ec9974fb
......@@ -68,7 +68,7 @@
\references{
The IBM ILOG CPLEX home page at
\url{https://www.ibm.com/support/knowledgecenter/SSSA5P}.
\url{https://www.ibm.com/docs/en}.
}
\author{
......
man/addQConstrCPLEX.Rd
+ 1
− 1
View file @ ec9974fb
......@@ -80,7 +80,7 @@
\references{
The IBM ILOG CPLEX home page at
\url{https://www.ibm.com/support/knowledgecenter/SSSA5P}.
\url{https://www.ibm.com/docs/en}.
}
\author{
......
man/addRowsCPLEX.Rd
+ 1
− 1
View file @ ec9974fb
......@@ -76,7 +76,7 @@
\references{
The IBM ILOG CPLEX home page at
\url{https://www.ibm.com/support/knowledgecenter/SSSA5P}.
\url{https://www.ibm.com/docs/en}.
}
\author{
......
man/baroptCPLEX.Rd
+ 1
− 1
View file @ ec9974fb
......@@ -40,7 +40,7 @@
\references{
The IBM ILOG CPLEX home page at
\url{https://www.ibm.com/support/knowledgecenter/SSSA5P}.
\url{https://www.ibm.com/docs/en}.
}
\author{
......
man/baseWriteCPLEX.Rd
+ 1
− 1
View file @ ec9974fb
......@@ -42,7 +42,7 @@
\references{
The IBM ILOG CPLEX home page at
\url{https://www.ibm.com/support/knowledgecenter/SSSA5P}.
\url{https://www.ibm.com/docs/en}.
}
\author{
......
man/basicPresolveCPLEX.Rd
+ 1
− 1
View file @ ec9974fb
......@@ -43,7 +43,7 @@
\references{
The IBM ILOG CPLEX home page at
\url{https://www.ibm.com/support/knowledgecenter/SSSA5P}.
\url{https://www.ibm.com/docs/en}.
}
\author{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment