From c7bf4031282168325a71115166009abba648e2ac Mon Sep 17 00:00:00 2001 From: Ben Stevenson Date: Thu, 28 May 2015 15:02:07 +0100 Subject: [PATCH] Version bump. --- DESCRIPTION | 4 ++-- Makefile | 6 +++--- NEWS | 2 ++ inst/scripts/install.r | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index ddf2f39..8b8a286 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: admbsecr Type: Package Title: SECR models with supplementary location information -Version: 1.1.2 -Date: 2015-05-22 +Version: 1.1.3 +Date: 2015-05-28 Author: Ben Stevenson , David Borchers Maintainer: Ben Stevenson diff --git a/Makefile b/Makefile index f207c07..5e38674 100644 --- a/Makefile +++ b/Makefile @@ -38,13 +38,13 @@ roxygen: build: R CMD build --resave-data . mkdir -p package-build - mv admbsecr_1.1.2.tar.gz package-build/ + mv admbsecr_1.1.3.tar.gz package-build/ check: - R CMD check package-build/admbsecr_1.1.2.tar.gz --no-tests + R CMD check package-build/admbsecr_1.1.3.tar.gz --no-tests install: - R CMD INSTALL package-build/admbsecr_1.1.2.tar.gz --install-tests + R CMD INSTALL package-build/admbsecr_1.1.3.tar.gz --install-tests pdf: R CMD Rd2pdf --pdf . & diff --git a/NEWS b/NEWS index 4791baf..46e9ebf 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ admbsecr 1.1.3 * Bug fix to sim.capt(), also affecting boot.admbsecr(), for signal strength models with call.freqs specified as an argument. +* Created optimisation executables with the new ADMB version 11.3. + * Added the acoustic-secr vignette. admbsecr 1.1.2 diff --git a/inst/scripts/install.r b/inst/scripts/install.r index 0e6901f..98fef48 100644 --- a/inst/scripts/install.r +++ b/inst/scripts/install.r @@ -8,17 +8,17 @@ for (i in pkgs){ } options(warn = 0) if (.Platform$OS == "windows"){ - bin.name <- "https://github.com/b-steve/admbsecr/releases/download/v1.1.2/admbsecr_1.1.2.zip" + bin.name <- "https://github.com/b-steve/admbsecr/releases/download/v1.1.3/admbsecr_1.1.3.zip" ext <- ".zip" type <- "win.binary" } else if (.Platform$OS == "unix"){ - bin.name <- "https://github.com/b-steve/admbsecr/archive/v1.1.2.tar.gz" + bin.name <- "https://github.com/b-steve/admbsecr/archive/v1.1.3.tar.gz" ext <- ".tar.gz" type <- "source" } else { stop("Unknown OS type.") } -dest <- paste("admbsecr_1.1.2", ext, sep = "") +dest <- paste("admbsecr_1.1.3", ext, sep = "") library(downloader) download(bin.name, destfile = dest) install.packages(dest, repos = NULL, type = type)