merge with master

DESCRIPTION

 Package: sybil
 Type: Package
 Title: Efficient Constrained Based Modelling in R
-Version: 2.0.2
-Date: 2017-03-24
+Version: 2.0.3
+Date: 2017-04-20
 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")),
@@ -53,7 +53,7 @@ Collate: generics.R validmodelorg.R validoptsol.R validreactId.R
         sysBiolAlg_lmomaClass.R sysBiolAlg_momaClass.R
         sysBiolAlg_mtfClass.R sysBiolAlg_mtfEasyConstraintClass.R
         sysBiolAlg_roomClass.R sybilLogClass.R upgradeModelorg.R
-Packaged: 2017-03-24 12:34:14 UTC; jonathan
+Packaged: 2017-04-20 12:34:14 UTC; jonathan
 Author: C. Jonathan Fritzemeier [cre, ctb],
   Gabriel Gelius-Dietrich [aut],
   Rajen Piernikarczyk [ctb],

R/generateWT.R

@@ -52,30 +52,30 @@
 	
 	# setting ... parameters into list
 	ca <- list(...)
-	if(is.null(ca$solver)){
-		ca$solver <- SYBIL_SETTINGS("SOLVER")
+	if(is.null(ca[["solver"]])){
+		ca[["solver"]] <- SYBIL_SETTINGS("SOLVER")
 	}
 
-    me <- checkDefaultMethod(solver = ca$solver,
+    me <- checkDefaultMethod(solver = ca[["solver"]],
                              method = "NA",
                              probType = "lp",
                              loadPackage = FALSE)
     
-    ca$solver <- me[["sol"]]
-    ca$method <- me[["met"]]
-    ca$solverParm <- as.data.frame(NA)
+    ca[["solver"]] <- me[["sol"]]
+    ca[["method"]] <- me[["met"]]
+    ca[["solverParm"]] <- as.data.frame(NA)
     
-    ca$object <- model
-    if(is.null(ca$algorithm)) ca$algorithm <- "fba"
-    ca$react <- react
-    ca$ub <- ub
-    ca$lb <- lb
+    ca[["object"]] <- model
+    if(is.null(ca[["algorithm"]])) ca[["algorithm"]] <- "fba"
+    ca[["react"]] <- react
+    ca[["ub"]] <- ub
+    ca[["lb"]] <- lb
 
     if (is(react, "list")) {
         message("calculating fba solutions ... ", appendLF = FALSE)
         suppressMessages({
-        	ca$lpdir <- rep("max", length(react))
-        	ca$verboseMode <- 0
+        	ca[["lpdir"]] <- rep("max", length(react))
+        	ca[["verboseMode"]] <- 0
         	
         	tmp <- do.call(optimizer, ca)
 #            tmp <- optimizer(model, algorithm = algorithm,
@@ -87,8 +87,8 @@
         message("OK")
     }
     else {
-    	ca$retOptSol <- FALSE
-    	ca$lpdir <- "max"
+    	ca[["retOptSol"]] <- FALSE
+    	ca[["lpdir"]] <- "max"
     	tmp <- do.call("optimizeProb", ca)
 #        tmp <- optimizeProb(model,
 #                            react = react, lb = lb, ub = ub,

inst/NEWS.Rd

@@ -6,6 +6,13 @@
 
 \newcommand{\CRANpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
 
+\section{Changes in version 2.0.3 2017-04-20}{
+  \itemize{
+  	\item The function \code{genrateWT} caused a problem when setting only \code{solverParm} and no solver.
+  }
+}
+% ---------------------------------------------------------------------------- %
+
 \section{Changes in version 2.0.2 2017-03-24}{
   \itemize{
   	\item The function \code{mod2irrev} crashed when using models with just one gene.