From 9a6ae39e877d951e7b4d0d237c3f53b19178f19d Mon Sep 17 00:00:00 2001
From: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@hhu.de>
Date: Mon, 30 Mar 2015 17:32:05 +0200
Subject: [PATCH] multiDel now doesnt use require any more
---
DESCRIPTION | 4 ++--
R/multiDel.R | 9 +++++++--
inst/NEWS.Rd | 6 ++++--
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 0e5529b..9254648 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: sybil
Type: Package
Title: sybil - Efficient Constrained Based Modelling in R
-Version: 1.2.9
-Date: 2014-11-19
+Version: 1.2.10
+Date: 2015-03-30
Authors@R: c(person("Gabriel", "Gelius-Dietrich", role = c("aut", "cre"), email = "geliudie@uni-duesseldorf.de"),
person(c("C.", "Jonathan"), "Fritzemeier", role = "ctb"),
person("Rajen", "Piernikarczyk", role = "ctb"),
diff --git a/R/multiDel.R b/R/multiDel.R
index fdc8f6f..1f68e6d 100644
--- a/R/multiDel.R
+++ b/R/multiDel.R
@@ -85,10 +85,15 @@ multiDel <- function(model, nProc = 2,
# load library 'parallel'
- if(!isTRUE(require("parallel"))) {
- stop("package parallel not found.")
+ if (!requireNamespace("parallel", quietly = TRUE)) {
+ stop("package parallel not found.")
}
+# unwanted conditioning for loading packages...
+# if(!isTRUE(require("parallel"))) {
+# stop("package parallel not found.")
+# }
+
# number of cores
ncore <- parallel::detectCores()
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
index e74e231..3dd8a16 100644
--- a/inst/NEWS.Rd
+++ b/inst/NEWS.Rd
@@ -7,9 +7,11 @@
\newcommand{\CRANpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
% ---------------------------------------------------------------------------- %
-\section{Changes in version 1.2.10 2015-03-02}{
+\section{Changes in version 1.2.10 2015-03-30}{
\itemize{
- \item \code{findExchangeReact} can now deal with bigger matrices
+ \item \code{findExchangeReact} can now deal with real big matrices (>30.000 columns).
+ \item additional example for readProb and writeProb.
+ \item modified \code{multiDel} to not use \code{require}
}
}
--
GitLab