[Analogue-commits] r400 - in pkg: . R inst tests/Examples

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

Author: gsimpson
Date: 2014-01-02 06:28:49 +0100 (Thu, 02 Jan 2014)
New Revision: 400

Modified:
   pkg/DESCRIPTION
   pkg/R/prcurve.R
   pkg/inst/ChangeLog
   pkg/tests/Examples/analogue-Ex.Rout.save
Log:
use dev.hold and dev.flush in plotting calls when plotit = TRUE

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2013-12-31 05:27:26 UTC (rev 399)
+++ pkg/DESCRIPTION	2014-01-02 05:28:49 UTC (rev 400)
@@ -1,7 +1,7 @@
 Package: analogue
 Type: Package
 Title: Analogue and weighted averaging methods for palaeoecology
-Version: 0.13-1
+Version: 0.13-2
 Date: $Date$
 Depends: R (>= 2.15.0), vegan (>= 1.17-12), lattice, rgl
 Imports: mgcv, MASS, stats, graphics, grid, brglm, princurve

Modified: pkg/R/prcurve.R
===================================================================
--- pkg/R/prcurve.R	2013-12-31 05:27:26 UTC (rev 399)
+++ pkg/R/prcurve.R	2014-01-02 05:28:49 UTC (rev 400)
@@ -134,9 +134,11 @@
         if(plotit) {
             ## plot the iteration -- need to add some components
             ## because of changes to plot method
+            dev.hold()
             config$data <- X
             config$ordination <- ord
             plot(config, sub = paste("Iteration:", iter))
+            dev.flush()
         }
         if (trace)
             writeLines(sprintf(paste("Iteration %",
@@ -175,9 +177,11 @@
         if(plotit) {
             ## plot the iteration -- need to add some components
             ## because of changes to plot method
+            dev.hold()
             config$data <- X
             config$ordination <- ord
             plot(config)
+            dev.flush()
         }
         if (trace)
             writeLines(sprintf(paste("Iteration %", max(3, nchar(maxit)),

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2013-12-31 05:27:26 UTC (rev 399)
+++ pkg/inst/ChangeLog	2014-01-02 05:28:49 UTC (rev 400)
@@ -1,5 +1,10 @@
 analogue Change Log
 
+Version 0.13-2 Opened 1 Jan 2014
+
+	* prcurve: uses `dev.hold()` & `dev.flush()` to smooth graphics
+	flicker during fitting with `plotit = TRUE`,
+
 Version 0.13-1 Opened 24 December 2013
 
 	* plot3d.prcuve: was not using the `data` & `ordination` objects

Modified: pkg/tests/Examples/analogue-Ex.Rout.save
===================================================================
--- pkg/tests/Examples/analogue-Ex.Rout.save	2013-12-31 05:27:26 UTC (rev 399)
+++ pkg/tests/Examples/analogue-Ex.Rout.save	2014-01-02 05:28:49 UTC (rev 400)
@@ -26,7 +26,7 @@
 Loading required package: lattice
 This is vegan 2.0-10
 Loading required package: rgl
-This is analogue 0.13-1
+This is analogue 0.13-2
 > 
 > base::assign(".oldSearch", base::search(), pos = 'CheckExEnv')
 > cleanEx()
@@ -7791,7 +7791,7 @@
 > ###
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  22.251 0.337 24.003 0.001 0.002 
+Time elapsed:  21.712 0.38 23.116 0.001 0.002 
 > grDevices::dev.off()
 null device 
           1