From 81e80ead18869470411a9c486eac958fa90f4a24 Mon Sep 17 00:00:00 2001 From: Scott Ritchie Date: Mon, 3 Jul 2017 16:00:14 +1000 Subject: [PATCH] Release 1.1.0 --- ChangeLog | 22 ++++++++++++++++++++++ DESCRIPTION | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6acdbd1..035f49d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2017-07-03 Scott Ritchie + + * DESCRIPTION: Release 1.1.0 + + * R/modulePreservation.R: 'nPerm' argument may now be set to 0 to calculate + the module preservation statistics across two datasets while skipping + the permutation test procedure. + + * src/permutations.cpp: reorganised code to return the observed test + statistics without performing the permutation test procedure when the + 'nPerm' argument in modulePreservation() is set to 0. + + * src/permutationsNoData.cpp: reorganised code to return the observed test + statistics without performing the permutation test procedure when the + 'nPerm' argument in modulePreservation() is set to 0. + + * man/modulePreservation.Rd: added description detailing the use case for + 'nPerm=0'. + + * man/*: minor changes in all man files due to generation with roxygen 6.0.1 + instead of roxygen 5.0.1. + 2016-11-15 Scott Ritchie * DESCRIPTION: Release 1.0.4 diff --git a/DESCRIPTION b/DESCRIPTION index 0ed02b8..65b42cb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: NetRep Type: Package Title: Permutation Testing Network Module Preservation Across Datasets -Version: 1.0.4 +Version: 1.1.0 Date: 2016-10-20 Authors@R: person(given="Scott", family="Ritchie", email="sritchie73@gmail.com",