[Stacomir-commits] r361 - in pkg/stacomir: . R man

[noreply at r-forge.r-project.org]

Author: briand
Date: 2017-05-15 16:38:09 +0200 (Mon, 15 May 2017)
New Revision: 361

Modified:
   pkg/stacomir/DESCRIPTION
   pkg/stacomir/R/BilanMigrationCar.r
   pkg/stacomir/R/stacomi.r
   pkg/stacomir/man/bmi.Rd
Log:
pb with dependencies

Modified: pkg/stacomir/DESCRIPTION
===================================================================
--- pkg/stacomir/DESCRIPTION	2017-05-15 14:16:50 UTC (rev 360)
+++ pkg/stacomir/DESCRIPTION	2017-05-15 14:38:09 UTC (rev 361)
@@ -98,8 +98,7 @@
     lubridate,
     dplyr,
     xtable,
-    mgcv,
-    MIfuns
+    mgcv
 Suggests:
     testthat,
     viridis

Modified: pkg/stacomir/R/BilanMigrationCar.r
===================================================================
--- pkg/stacomir/R/BilanMigrationCar.r	2017-05-15 14:16:50 UTC (rev 360)
+++ pkg/stacomir/R/BilanMigrationCar.r	2017-05-15 14:38:09 UTC (rev 361)
@@ -522,8 +522,15 @@
 				}		
 				return(xt)
 			} else {
-				# class is an array
-				xt<-xtable::xtable(MIfuns::ftable2data.frame(ftable(dat)),...)
+				# this comes from MIfuns not avalaible on CRAN
+				ftable2data.frame<-function (x, ...) 
+				{
+					y <- format(x, quote = FALSE)
+					z <- data.frame(y[-1, ], stringsAsFactors = FALSE)
+					names(z) <- y[1, ]
+					z
+				}
+				xt<-xtable::xtable(ftable2data.frame(ftable(dat)),...)
 				if (is.null(align)) {
 					align<-c("l",rep("r",ncol(dat)))
 					align(xt)<-align

Modified: pkg/stacomir/R/stacomi.r
===================================================================
--- pkg/stacomir/R/stacomi.r	2017-05-15 14:16:50 UTC (rev 360)
+++ pkg/stacomir/R/stacomi.r	2017-05-15 14:38:09 UTC (rev 361)
@@ -306,7 +306,6 @@
 #' @importFrom Hmisc wtd.quantile 
 #' @importFrom Hmisc capitalize 
 #' @importFrom mgcv gam
-#' @importFrom MIfuns ftable2data.frame
 #' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
 #' @examples
 #' 

Modified: pkg/stacomir/man/bmi.Rd
===================================================================
--- pkg/stacomir/man/bmi.Rd	2017-05-15 14:16:50 UTC (rev 360)
+++ pkg/stacomir/man/bmi.Rd	2017-05-15 14:38:09 UTC (rev 361)
@@ -1,12 +1,11 @@
 % Generated by roxygen2: do not edit by hand
 % Please edit documentation in R/data.r
-\docType{data}
 \name{bmi}
 \alias{bmi}
 \title{Daily glass eel and elver migration from 1984 to 2016 in the Sevre Niortaise}
 \format{An object of class \link{BilanMigrationInterAnnuelle-class} with data loaded.}
 \usage{
-bmi
+bmi(wt, ht)
 }
 \description{
 The first eel trapping ladder in France was built by Antoine Legault and the team from Rennes