[Analogue-commits] r306 - pkg

[noreply at r-forge.r-project.org]

Author: gsimpson
Date: 2013-03-18 03:43:57 +0100 (Mon, 18 Mar 2013)
New Revision: 306

Modified:
   pkg/DESCRIPTION
   pkg/NAMESPACE
Log:
update namespace due to recent additions to pkg, 'grid' moved to Imports, bump to 0.11-1

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2013-03-18 02:42:26 UTC (rev 305)
+++ pkg/DESCRIPTION	2013-03-18 02:43:57 UTC (rev 306)
@@ -1,11 +1,10 @@
 Package: analogue
 Type: Package
 Title: Analogue and weighted averaging methods for palaeoecology
-Version: 0.11-0
+Version: 0.11-1
 Date: $Date$
-Depends: R (>= 2.15.0), vegan (>= 1.17-12), lattice, grid, 
-         princurve
-Imports: mgcv, MASS, stats, graphics
+Depends: R (>= 2.15.0), vegan (>= 1.17-12), princurve, lattice
+Imports: mgcv, MASS, stats, graphics, grid
 Author: Gavin L. Simpson, Jari Oksanen
 Maintainer: Gavin L. Simpson <gavin.simpson at ucl.ac.uk>
 Description: Fits Modern Analogue Technique and Weighted Averaging transfer 

Modified: pkg/NAMESPACE
===================================================================
--- pkg/NAMESPACE	2013-03-18 02:42:26 UTC (rev 305)
+++ pkg/NAMESPACE	2013-03-18 02:43:57 UTC (rev 306)
@@ -4,21 +4,34 @@
 ## Imports
 ##
 ## vegan
-importFrom(vegan, pasteCall, eigenvals, tolerance)
+importFrom(vegan, pasteCall, eigenvals, tolerance, scores)
 ## mgcv
 importFrom(mgcv, gam, s, smoothCon, mono.con, pcls, Predict.matrix)
 ## MASS
 importFrom(MASS, dose.p)
 ## lattice
-importFrom(lattice, densityplot, histogram, panel.refline, panel.grid,
-           panel.lines, panel.points, panel.polygon, panel.abline,
-           trellis.par.get)
+##   -- need here *only* those funs that we define S3 methods for
+##      not the functions from lattice we use as they are covered
+##      by Depends: lattice in DESCRIPTION
+importFrom(lattice, densityplot, histogram)
 ## stats
 import(stats)
 ## utils
 importFrom(utils, head, tail)
 ## graphics
 import(graphics)
+## grid
+importFrom(grid,
+           convertWidth,
+           gpar,
+           grid.layout,
+           grobWidth,
+           frameGrob,
+           placeGrob,
+           rectGrob,
+           textGrob,
+           unit,
+           unit.c)
 
 ## Exports
 export(analog,
@@ -124,6 +137,7 @@
 S3method(roc, default)
 S3method(roc, analog)
 S3method(roc, mat)
+S3method(scores, prcurve)
 S3method(stdError, mat)
 S3method(stdError, predict.mat)
 S3method("setK<-", default)
@@ -164,6 +178,7 @@
 S3method(plot, dissimilarities)
 S3method(plot, gradientDist)
 S3method(lines, gradientDist)
+S3method(lines, prcurve)
 S3method(points, gradientDist)
 S3method(plot, logitreg)
 S3method(plot, mat)