diff --git a/DESCRIPTION b/DESCRIPTION index 79ee241b47375583e2130f4e8772d896f595c61a..909d9451108adec5f71e76cea0f6bfe868f2a97d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,20 +1,21 @@ Package: cplexAPI Type: Package Title: R Interface to C API of IBM ILOG CPLEX -Version: 1.2.11 -Date: 2014-07-28 -Authors@R: c(person("Gabriel", "Gelius-Dietrich", role = c("aut", "cre"), email = "geliudie@uni-duesseldorf.de")) +Version: 1.3.2 +Date: 2016-11-16 +Authors@R: c(person(c("C.", "Jonathan"), "Fritzemeier", role = c("cre", "ctb"), email = "clausjonathan.fritzemeier@uni-duesseldorf.de"), + person("Gabriel", "Gelius-Dietrich", role = c("aut"), email = "geliudie@uni-duesseldorf.de")) Depends: R (>= 2.6.0) Imports: methods -Description: R Interface to C API of IBM ILOG CPLEX, depends on IBM ILOG CPLEX (>= 12.1) +Description: This is the R Interface to the C API of IBM ILOG CPLEX. It necessarily depends on IBM ILOG CPLEX (>= 12.1). SystemRequirements: IBM ILOG CPLEX (>= 12.1) -License: GPL-3 +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: 2014-07-28 08:53:41 UTC; gabriel -Author: Gabriel Gelius-Dietrich [aut, cre] -Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> +Packaged: 2016-11-16 09:15:00 UTC; jonathan +Author: C. Jonathan Fritzemeier [cre, ctb], Gabriel Gelius-Dietrich [aut] +Maintainer: C. Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> NeedsCompilation: yes Repository: CRAN -Date/Publication: 2014-07-28 18:16:22 +Date/Publication: 2016-11-16 09:15:00 diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index 7ebb4deb81193468f840d923021a7ac5b7667376..b5a0cd46f1bb81b50e6dd9dfe11931576adec5c4 100644 --- a/inst/NEWS.Rd +++ b/inst/NEWS.Rd @@ -4,6 +4,12 @@ \title{cplexAPI News} \encoding{UTF-8} +% ---------------------------------------------------------------------------- % +\section{Changes in version 1.3.2 2016-11-16}{ + \itemize{ + \item Fixed a bug in \code{getQuad()}. Thx to Florian Schwendinger. + } +} % ---------------------------------------------------------------------------- % \section{Changes in version 1.2.11 2014-07-28}{ diff --git a/src/cplexAPI.c b/src/cplexAPI.c index fb07b9239bedaafee4d81ccd69b6df47998eb946..496e5598e96916e4ef58aba8d11ae9ba5986d5d6 100644 --- a/src/cplexAPI.c +++ b/src/cplexAPI.c @@ -6032,7 +6032,7 @@ SEXP getQuad(SEXP env, SEXP lp, SEXP begin, SEXP end) { qmatsp -= sp; PROTECT(qmatind = Rf_allocVector(INTSXP, qmatsp)); PROTECT(qmatval = Rf_allocVector(REALSXP, qmatsp)); - status = CPXgetcols(R_ExternalPtrAddr(env), R_ExternalPtrAddr(lp), + status = CPXgetquad(R_ExternalPtrAddr(env), R_ExternalPtrAddr(lp), &nnz, INTEGER(qmatbeg), INTEGER(qmatind), REAL(qmatval), qmatsp, &sp, Rf_asInteger(begin), Rf_asInteger(end)