diff --git a/.gitignore b/.gitignore index 32358936d0b933fa577bc062610396a386202048..8e7869a3a1ebe7e8bc71ad83c4268a5fae6cb1c0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,7 @@ # ignore build r package: sybil_*.tar.gz + +# ignore Mac OS X Finder databases: +.DS_Store + diff --git a/DESCRIPTION b/DESCRIPTION index 7b8e05125114dc8ca0461420eb9cb8674ef37cf2..befcb9803fa6e318440157310e238aeb615db651 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,12 +1,13 @@ Package: sybilGUROBI Type: Package Title: Gurobi support for sybil -Version: 1.0.5 -Date: 2015-11-16 -Authors@R: c(person("Gabriel", "Gelius-Dietrich", role = c("aut", "cre"), email = "geliudie@uni-duesseldorf.de")) +Version: 1.0.6 +Date: 2018-09-24 +Authors@R: c(person("Mayo", "Roettger", role = "cre", email = "mayo.roettger@hhu.de"), + person("Gabriel", "Gelius-Dietrich", role = "aut", email = "geliudie@uni-duesseldorf.de")) Depends: R (>= 2.14.2), sybil (>= 1.2.2), gurobi, Matrix, methods Description: Gurobi support for sybil License: GPL-3 -Packaged: 2015-11-16 11:00:00 UTC; jonathan -Author: Gabriel Gelius-Dietrich [aut, cre] -Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> +Packaged: 2018-09-24 09:25:00 UTC; mayo +Author: Gabriel Gelius-Dietrich [aut] +Maintainer: Mayo Roettger <mayo.roettger@hhu.de> diff --git a/R/optObj_sybilGUROBIClass.R b/R/optObj_sybilGUROBIClass.R index 0a572b2ad1d3fd09cb54a5e1bce7cf2e64d932f5..35fd43b79698a5c14a92f4a8b2c349acba5238f3 100644 --- a/R/optObj_sybilGUROBIClass.R +++ b/R/optObj_sybilGUROBIClass.R @@ -27,7 +27,9 @@ #------------------------------------------------------------------------------# setClass(Class = "optObj_sybilGUROBI", - representation(grb = "character"), + slots = c( + grb = "character" + ), contains = "optObj") diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index 9f2b7fa9acd819d92543afb35eb2f9aa63523e30..ce122cae5c7abffd1b7b015830d356e37e23eefe 100644 --- a/inst/NEWS.Rd +++ b/inst/NEWS.Rd @@ -6,6 +6,15 @@ \newcommand{\CRANpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}} +% ---------------------------------------------------------------------------- % +\section{Changes in version 1.0.6 2018-09-24}{ + \itemize{ + \item maintainer change version 1.0.6 + \item changed \code{representation(grb = "character"} in class \code{optObj_sybilGUROBI} + into \code{slots = c(grb = "character")"") + } +} + % ---------------------------------------------------------------------------- % \section{Changes in version 1.0.5 2015-11-16}{ \itemize{