Commit 09e05a6d authored by Philip Rinn's avatar Philip Rinn

Remove calls to `Rcpp:::CxxFlags()` and `Rcpp:::LdFlags()`

parent 898b53f2
2019-01-02 Philip Rinn <philip.rinn@uni-oldenburg.de>
* Tag as version 1.2.1
* Remove calls to `Rcpp:::CxxFlags()` and `Rcpp:::LdFlags()`
2017-07-20 Philip Rinn <philip.rinn@uni-oldenburg.de>
* Add package registration code
......
Package: Langevin
Type: Package
Title: Langevin Analysis in One and Two Dimensions
Version: 1.2
Date: 2016-08-29
Version: 1.2.1
Date: 2019-01-02
Authors@R: c(person('Philip', 'Rinn', email='philip.rinn@uni-oldenburg.de',
role=c('aut','cre')), person('Pedro G.', 'Lind', role='aut'),
person('David', 'Bastine', role='ctb'))
......@@ -20,4 +20,4 @@ Depends:
Imports:
Rcpp (>= 0.11.0)
LinkingTo: Rcpp, RcppArmadillo (>= 0.4.600.0)
RoxygenNote: 6.0.1
RoxygenNote: 6.1.1
......@@ -4,8 +4,8 @@
\alias{Langevin1D}
\title{Calculate the Drift and Diffusion of one-dimensional stochastic processes}
\usage{
Langevin1D(data, bins, steps, sf = ifelse(is.ts(data), frequency(data), 1),
bin_min = 100, reqThreads = -1)
Langevin1D(data, bins, steps, sf = ifelse(is.ts(data), frequency(data),
1), bin_min = 100, reqThreads = -1)
}
\arguments{
\item{data}{a vector containing the time series or a time-series object.}
......
......@@ -4,8 +4,8 @@
\alias{Langevin2D}
\title{Calculate the Drift and Diffusion of two-dimensional stochastic processes}
\usage{
Langevin2D(data, bins, steps, sf = ifelse(is.mts(data), frequency(data), 1),
bin_min = 100, reqThreads = -1)
Langevin2D(data, bins, steps, sf = ifelse(is.mts(data), frequency(data),
1), bin_min = 100, reqThreads = -1)
}
\arguments{
\item{data}{a matrix containing the time series as columns or a time-series
......
......@@ -4,7 +4,8 @@
\alias{print.Langevin}
\title{Print estimated drift and diffusion coefficients}
\usage{
\method{print}{Langevin}(x, digits = max(3, getOption("digits") - 3), ...)
\method{print}{Langevin}(x, digits = max(3, getOption("digits") - 3),
...)
}
\arguments{
\item{x}{an object of class "Langevin".}
......
......@@ -4,8 +4,8 @@
\alias{summary.Langevin}
\title{Summarize estimated drift and diffusion coefficients}
\usage{
\method{summary}{Langevin}(object, ..., digits = max(3, getOption("digits") -
3))
\method{summary}{Langevin}(object, ..., digits = max(3,
getOption("digits") - 3))
}
\arguments{
\item{object}{an object of class "Langevin".}
......
......@@ -4,8 +4,8 @@
\alias{timeseries1D}
\title{Generate a 1D Langevin process}
\usage{
timeseries1D(N, startpoint = 0, d13 = 0, d12 = 0, d11 = -1, d10 = 0,
d22 = 0, d21 = 0, d20 = 1, sf = 1000, dt = 0)
timeseries1D(N, startpoint = 0, d13 = 0, d12 = 0, d11 = -1,
d10 = 0, d22 = 0, d21 = 0, d20 = 1, sf = 1000, dt = 0)
}
\arguments{
\item{N}{a scalar denoting the length of the time-series to generate.}
......
......@@ -4,12 +4,13 @@
\alias{timeseries2D}
\title{Generate a 2D Langevin process}
\usage{
timeseries2D(N, startpointx = 0, startpointy = 0, D1_1 = matrix(c(0, -1,
rep(0, 14)), nrow = 4), D1_2 = matrix(c(0, 0, 0, 0, -1, rep(0, 11)), nrow =
4), g_11 = matrix(c(1, 0, 0, 0, 0, 0, 0, 0, 0), nrow = 3),
g_12 = matrix(c(0, 0, 0, 0, 0, 0, 0, 0, 0), nrow = 3), g_21 = matrix(c(0,
0, 0, 0, 0, 0, 0, 0, 0), nrow = 3), g_22 = matrix(c(1, 0, 0, 0, 0, 0, 0, 0,
0), nrow = 3), sf = 1000, dt = 0)
timeseries2D(N, startpointx = 0, startpointy = 0, D1_1 = matrix(c(0,
-1, rep(0, 14)), nrow = 4), D1_2 = matrix(c(0, 0, 0, 0, -1, rep(0,
11)), nrow = 4), g_11 = matrix(c(1, 0, 0, 0, 0, 0, 0, 0, 0), nrow = 3),
g_12 = matrix(c(0, 0, 0, 0, 0, 0, 0, 0, 0), nrow = 3),
g_21 = matrix(c(0, 0, 0, 0, 0, 0, 0, 0, 0), nrow = 3),
g_22 = matrix(c(1, 0, 0, 0, 0, 0, 0, 0, 0), nrow = 3), sf = 1000,
dt = 0)
}
\arguments{
\item{N}{a scalar denoting the length of the time-series to generate.}
......
## Use the R_HOME indirection to support installations of multiple R version
PKG_CXXFLAGS = `$(R_HOME)/bin/Rscript -e "Rcpp:::CxxFlags()"` $(SHLIB_OPENMP_CXXFLAGS)
PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) $(SHLIB_OPENMP_CXXFLAGS)
## With R 3.1.0 or later, you can uncomment the following line to tell R to
## enable compilation with C++11 (where available)
##
## Also, OpenMP support in Armadillo prefers C++11 support. However, for wider
## availability of the package we do not yet enforce this here. It is however
## recommended for client packages to set it.
##
## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP
## support within Armadillo prefers / requires it
CXX_STD = CXX11
PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
## Use the R_HOME indirection to support installations of multiple R version
PKG_CXXFLAGS = $(shell $(R_HOME)/bin/Rscript.exe -e "Rcpp:::CxxFlags()") $(SHLIB_OPENMP_CXXFLAGS)
PKG_LIBS = $(shell $(R_HOME)/bin/Rscript.exe -e "Rcpp:::LdFlags()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) $(SHLIB_OPENMP_CXXFLAGS)
## With R 3.1.0 or later, you can uncomment the following line to tell R to
## enable compilation with C++11 (where available)
##
## Also, OpenMP support in Armadillo prefers C++11 support. However, for wider
## availability of the package we do not yet enforce this here. It is however
## recommended for client packages to set it.
##
## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP
## support within Armadillo prefers / requires it
CXX_STD = CXX11
PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
Markdown is supported
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