Skip to content
Snippets Groups Projects
Commit ca901ae9 authored by Claus Jonathan Fritzemeier's avatar Claus Jonathan Fritzemeier
Browse files

switch and imports fixed

parent 30c46bbb
No related branches found
No related tags found
No related merge requests found
Package: sybilGUROBI Package: sybilGUROBI
Type: Package Type: Package
Title: Gurobi support for sybil Title: Gurobi support for sybil
Version: 1.0.4 Version: 1.0.5
Date: 2013-07-23 Date: 2015-11-16
Authors@R: c(person("Gabriel", "Gelius-Dietrich", role = c("aut", "cre"), email = "geliudie@uni-duesseldorf.de")) 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 Depends: R (>= 2.14.2), sybil (>= 1.2.2), gurobi, Matrix, methods
Description: Gurobi support for sybil Description: Gurobi support for sybil
License: GPL-3 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] Author: Gabriel Gelius-Dietrich [aut, cre]
Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de>
import(gurobi) import(gurobi)
importFrom("sybil", optObj) importFrom("sybil", optObj)
import(methods)
import(Matrix)
exportClass("optObj_sybilGUROBI") exportClass("optObj_sybilGUROBI")
......
...@@ -245,7 +245,7 @@ setMethod("addRowsToProb", signature(lp = "optObj_sybilGUROBI"), ...@@ -245,7 +245,7 @@ setMethod("addRowsToProb", signature(lp = "optObj_sybilGUROBI"),
for (k in seq(along = i)) { for (k in seq(along = i)) {
ltype <- switch(type[k], ltype <- switch(EXPR = type[k],
"L" = { ">=" }, "L" = { ">=" },
"U" = { "<=" }, "U" = { "<=" },
"E" = { "=" }, "E" = { "=" },
...@@ -391,7 +391,7 @@ setMethod("loadLPprob", signature(lp = "optObj_sybilGUROBI"), ...@@ -391,7 +391,7 @@ setMethod("loadLPprob", signature(lp = "optObj_sybilGUROBI"),
stopifnot(is(mat, "Matrix")) stopifnot(is(mat, "Matrix"))
crtype <- sapply(rtype, crtype <- sapply(rtype,
function(x) switch(x, function(x) switch(EXPR = x,
"L" = { ">=" }, "L" = { ">=" },
"U" = { "<=" }, "U" = { "<=" },
"E" = { "=" }, "E" = { "=" },
......
...@@ -6,6 +6,14 @@ ...@@ -6,6 +6,14 @@
\newcommand{\CRANpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}} \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}{ \section{Changes in version 1.0.4 2013-07-23}{
\itemize{ \itemize{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment