Commit 7dcca25a authored by jfuser's avatar jfuser
Browse files

update cran check and warn compiling

parent c40732e6
......@@ -5,11 +5,11 @@ Title: Landscape Epidemio
Version: 0.0.1
Date: 2017-11-23
Authors@R: c(person("Loup", "Rimbaud", role = "aut", email = "loup.rimbaud@csiro.au"),
person("Jean-Francois", "Rey", role = "cre", email = "jean-francois.rey@inra.fr"),
person("Julien", "Papaix", role = c("aut","cre"), email = "julien.papaix@inra.fr"))
Author: Jean-Francois Rey [cre],
person("Julien", "Papaix", role = "aut", email = "julien.papaix@inra.fr"),
person("Jean-Francois", "Rey", role = "cre", email = "jean-francois.rey@inra.fr"))
Author: Loup Rimbaud [aut],
Julien Papaix [aut],
Loup Rimbaud [aut]
Jean-Francois Rey [cre]
Maintainer: Jean-Francois Rey <jean-francois.rey@inra.fr>
Description: A description
License: GPL (>= 2) | file LICENSE
......@@ -19,6 +19,7 @@ VignetteBuilder: knitr
SystemRequirements: C++11, gsl, gdal
Depends:
methods,
utils,
grDevices (>= 3.0.0),
graphics (>= 3.0.0),
R (>= 3.0.0),
......@@ -28,6 +29,8 @@ Imports:
stats (>= 3.0.2),
rgdal,
raster,
Matrix,
MASS,
rgeos,
maptools,
fields,
......
......@@ -3,8 +3,11 @@
export(AgriLand)
export(demo_landepi)
export(modeleLandsLPI)
import(MASS)
import(Matrix)
import(Rcpp)
import(fields)
import(graphics)
import(maptools)
import(methods)
import(raster)
......@@ -13,4 +16,7 @@ import(rgeos)
import(sp)
import(splancs)
import(stats)
importFrom(sf,st_as_sf)
importFrom(sf,st_write)
importFrom(utils,data)
useDynLib(landsepi)
#' @title AgriLand
#' @description do something
#' @param landscape a saptialpolygon object
#' @param filename output layer name
#' @param propSR num
#' @param isolSR num
#' @param propRR num
#' @param isolRR num
#' @param strat num
#' @param Nhote num
#' @param nYears number of years
#' @param Cmax0 num
#' @param Cmax1 num
#' @importFrom sf st_as_sf
#' @importFrom sf st_write
#' @include multiN.R periodic_cov.R graphLand.R
#' @export
AgriLand <- function(landscape,filename="landscapeTEST",propSR,isolSR,propRR,isolRR,strat,Nhote,nYears,Cmax0,Cmax1){
......
......@@ -5,7 +5,7 @@
#' @name modeleLandsLPI
#' @description Modele ...
#' @param times simulation years and step
#' @param traits Number of feature
#' @param dispersion dispersion features
#' @param landscape list of landscape file name and layer name
#' @param inits list inits variables
#' @param val_seed seed value
......
......@@ -15,6 +15,7 @@
#' Run demo landepi
#' @include RcppExports.R AgriLand.R graphLand.R multiN.R periodic_cov.R
#' @importFrom utils data
#' @export
demo_landepi <- function(){
......@@ -28,7 +29,7 @@ nYears <- 10
Cmax0 <- 2
Cmax1 <- 2
data(landscapeTEST)
data(landscapeTEST, envir = environment())
landscape <- AgriLand(landscapeTEST,filename="paysageTEST",propSR,isolSR,propRR,isolRR,strat,Nhote,nYears,Cmax0,Cmax1)
......
......@@ -35,7 +35,6 @@
#' and (iii) an ecotoxicological equation describing how contaminants affect individuals of the exposed population.
#'
#' @keywords model spatial survival
#' @seealso \code{\link{demo.run}}
#' @examples \dontrun{
#' ## Run a simulation
#' library("landsepi")
......@@ -43,13 +42,17 @@
#' }
#' @useDynLib landsepi
#' @import methods
#' @import graphics
#' @import stats
#' @import Rcpp
#' @import rgdal
#' @import rgeos
#' @import Matrix
#' @import MASS
#' @import maptools
#' @import fields
#' @import raster
#' @import sp
#' @import splancs
#' @importFrom utils data
"_PACKAGE"
......@@ -2542,6 +2542,7 @@ fi
LDFLAGS="${LDFLAGS} ${GDAL_LIBS}"
CXXFLAGS="${CXXFLAGS} -Wno-write-strings"
# R mode
......
......@@ -108,6 +108,7 @@ fi
LDFLAGS="${LDFLAGS} ${GDAL_LIBS}"
CXXFLAGS="${CXXFLAGS} -Wno-write-strings"
dnl -----------------------------------------------
dnl Generates Makefile's, configuration files and scripts
......
......@@ -7,3 +7,29 @@
AgriLand(landscape, filename = "landscapeTEST", propSR, isolSR, propRR,
isolRR, strat, Nhote, nYears, Cmax0, Cmax1)
}
\arguments{
\item{landscape}{a saptialpolygon object}
\item{filename}{output layer name}
\item{propSR}{num}
\item{isolSR}{num}
\item{propRR}{num}
\item{isolRR}{num}
\item{strat}{num}
\item{Nhote}{num}
\item{nYears}{number of years}
\item{Cmax0}{num}
\item{Cmax1}{num}
}
\description{
do something
}
......@@ -38,9 +38,6 @@ library("landsepi")
demo_landsepi()
}
}
\seealso{
\code{\link{demo.run}}
}
\author{
Loup Rimbaud \email{loup.rimbaud@csiro.au}
......
......@@ -11,13 +11,13 @@ modeleLandsLPI(times, landscape, dispersion, inits, val_seed, host)
\item{landscape}{list of landscape file name and layer name}
\item{dispersion}{dispersion features}
\item{inits}{list inits variables}
\item{val_seed}{seed value}
\item{host}{host param}
\item{traits}{Number of feature}
}
\value{
nothing yet
......
......@@ -57,7 +57,7 @@ void init_aggrFormula(int Npatho, int Naggr, int *adaptation, int ********aggrTo
}
if (Npatho < 101)
print_i2(stdout, Npatho, 8, pathoToAggr, "pathoToAggr");
print_i2(stdout, Npatho, 8, pathoToAggr, (const char *)"pathoToAggr");
}
......
......@@ -70,7 +70,7 @@ using namespace std;
//' @name modeleLandsLPI
//' @description Modele ...
//' @param times simulation years and step
//' @param traits Number of feature
//' @param dispersion dispersion features
//' @param landscape list of landscape file name and layer name
//' @param inits list inits variables
//' @param val_seed seed value
......
......@@ -24,7 +24,7 @@ void print_d1(FILE *f, int n, double *t, char *title) {
}
/* Print a table of integer */
void print_i2(FILE *f, int l, int c, int **t, char *title) {
void print_i2(FILE *f, int l, int c, int **t, const char *title) {
int i ;
if (title!="")
fprintf(f, "%s : \n", title);
......
......@@ -18,7 +18,7 @@ void print_i1(FILE *f, int n, int *t, char *title);
void print_d1(FILE *f, int n, double *t, char *title);
/* Print a table of integer */
void print_i2(FILE *f, int l, int c, int **t, char *title);
void print_i2(FILE *f, int l, int c, int **t, const char *title);
/* Print a 3-dimension table of integer */
void print_i3(FILE *f, int z, int l, int c, int ***t, char *title);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment