From ca901ae90fdab1b87eddbcfc22c1451b746e383f Mon Sep 17 00:00:00 2001
From: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@hhu.de>
Date: Mon, 16 Nov 2015 11:01:05 +0100
Subject: [PATCH] switch and imports fixed
---
DESCRIPTION | 6 +++---
NAMESPACE | 2 ++
R/optObj_sybilGUROBIClass.R | 4 ++--
inst/NEWS.Rd | 8 ++++++++
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 8321a85..7b8e051 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,12 +1,12 @@
Package: sybilGUROBI
Type: Package
Title: Gurobi support for sybil
-Version: 1.0.4
-Date: 2013-07-23
+Version: 1.0.5
+Date: 2015-11-16
Authors@R: c(person("Gabriel", "Gelius-Dietrich", role = c("aut", "cre"), 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: 2013-07-23 14:16:44 UTC; gabriel
+Packaged: 2015-11-16 11:00:00 UTC; jonathan
Author: Gabriel Gelius-Dietrich [aut, cre]
Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de>
diff --git a/NAMESPACE b/NAMESPACE
index 9ec36d7..fb234e8 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,5 +1,7 @@
import(gurobi)
importFrom("sybil", optObj)
+import(methods)
+import(Matrix)
exportClass("optObj_sybilGUROBI")
diff --git a/R/optObj_sybilGUROBIClass.R b/R/optObj_sybilGUROBIClass.R
index 1be1a01..0a572b2 100644
--- a/R/optObj_sybilGUROBIClass.R
+++ b/R/optObj_sybilGUROBIClass.R
@@ -245,7 +245,7 @@ setMethod("addRowsToProb", signature(lp = "optObj_sybilGUROBI"),
for (k in seq(along = i)) {
- ltype <- switch(type[k],
+ ltype <- switch(EXPR = type[k],
"L" = { ">=" },
"U" = { "<=" },
"E" = { "=" },
@@ -391,7 +391,7 @@ setMethod("loadLPprob", signature(lp = "optObj_sybilGUROBI"),
stopifnot(is(mat, "Matrix"))
crtype <- sapply(rtype,
- function(x) switch(x,
+ function(x) switch(EXPR = x,
"L" = { ">=" },
"U" = { "<=" },
"E" = { "=" },
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
index c1eb4ba..9f2b7fa 100644
--- a/inst/NEWS.Rd
+++ b/inst/NEWS.Rd
@@ -6,6 +6,14 @@
\newcommand{\CRANpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
+% ---------------------------------------------------------------------------- %
+\section{Changes in version 1.0.5 2015-11-16}{
+ \itemize{
+ \item switch statemens need explicit name of EXPR
+ \item changes on imports
+ }
+}
+
% ---------------------------------------------------------------------------- %
\section{Changes in version 1.0.4 2013-07-23}{
\itemize{
--
GitLab