From f4c531c2bd4e5ae397282c1b79ba8dc6577d84a1 Mon Sep 17 00:00:00 2001
From: Magnus Dehli Vigeland <magnusdv@medisin.uio.no>
Date: Sat, 13 Mar 2021 15:31:14 +0100
Subject: [PATCH] Prepare CRAN release

---
 DESCRIPTION |  3 +--
 NAMESPACE   |  2 --
 NEWS.md     | 11 ++++++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 93f81cd..e3ad172 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: forrel
 Type: Package
 Title: Forensic Pedigree Analysis and Relatedness Inference
-Version: 1.2.0.9000
+Version: 1.3.0
 Authors@R: c(
     person("Magnus Dehli", "Vigeland", email = "m.d.vigeland@medisin.uio.no", 
            role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9134-4962")),
@@ -33,7 +33,6 @@ Imports:
     pedprobr (>= 0.4),
     ribd,
     pedmut,
-    maxLik,
     glue
 Suggests: testthat,
     ggplot2,
diff --git a/NAMESPACE b/NAMESPACE
index a814543..1c82a70 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -8,7 +8,6 @@ S3method(print,LRpowerResult)
 S3method(print,LRresult)
 S3method(print,ibdEst)
 export(Familias2ped)
-export(IBDestimateOLD)
 export(IBDtriangle)
 export(LRpower)
 export(MPPsims)
@@ -48,7 +47,6 @@ importFrom(graphics,polygon)
 importFrom(graphics,rect)
 importFrom(graphics,segments)
 importFrom(graphics,text)
-importFrom(maxLik,maxLik)
 importFrom(parallel,clusterEvalQ)
 importFrom(parallel,clusterExport)
 importFrom(parallel,clusterSetRNGStream)
diff --git a/NEWS.md b/NEWS.md
index 9d64d95..97b4cc3 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,13 @@
-# dev version
+# forrel 1.3.0
+
+# New features
+
+* The new function `ibdEstimate()` replaces the previous `IBDestimate()` (note the name change). This is a complete rewrite, which optimises the log-likelihood using a projected gradient descent algorithm, combined with a version of Armijo line search.
+
+* The function `ibdBootstrap()` replaces the previous `kappaBootstrap()` and `deltaBootstrap()`, and is considerably faster. This function implements both parametric and non-parametric bootstrap, controlled with the `method` parameter.
+
+* The output of `ibdEstimate()` now has a class attribute "ibdEst", with its own print and subsetting methods.
+
 
 
 # forrel 1.2.0