version 1.1

CHANGES

@@ -1,3 +1,9 @@
 Version 1.0
 
  o  Initial version released to CRAN. Based on previous RcmdrPlugin.EHESsampling
+
+
+Version 1.1
+
+ o  Necessary ImportFrom() changes
+

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: RcmdrPlugin.sampling
 Title: Tools for sampling in Official Statistical Surveys
-Version: 1.0
-Date: 2013-06-20
+Version: 1.1
+Date: 2013-08-23
 Depends: lpSolve, sampling, MASS
 Imports: Rcmdr
 Author: Susie Jentoft and Johan Heldal
@@ -14,7 +14,7 @@ Description: This package includes tools for calculating sample sizes and
  Commission's official position. 
 License: GPL (>= 2)
 LazyLoad: yes
-Packaged: 2013-07-10 09:45:34 UTC; coo
+Packaged: 2013-08-23 10:28:20 UTC; coo
 NeedsCompilation: no
 Repository: CRAN
-Date/Publication: 2013-07-10 12:26:41
+Date/Publication: 2013-08-23 14:07:26

MD5

@@ -1,22 +1,22 @@
-771f47e7244576956460e24b4e00b7ad *CHANGES
-09699800e799a2c9e0cbc3c742f17407 *DESCRIPTION
-79736604baa4d6974ce41cde3c517b11 *NAMESPACE
+48bb1cfdaef83d30a3ef6f5d6ebfc40d *CHANGES
+8aff8139667042a8a1a7c57f0e3c0b29 *DESCRIPTION
+fed81662d4e09d7abe56f8a69fff7393 *NAMESPACE
 7de3f8bff6ae255a044d97f6fafff6ad *R/Help.R
 3885213f6c61526af0c37e0291ff1b64 *R/RcmdrPlugin.sampling.R
-cd6dbcbbcce04f713c3cd7f70424d642 *R/SRS.notebook.R
+11f72c5a49a0dbda51964fc89760a0e6 *R/SRS.notebook.R
 7a02aa9dd08d8c958a8a05dd6adc5906 *R/SampleSizes.R
 cbea23fc81289939cbef7dca7beff01b *R/SampleSizes.notebook.R
 8a858ee70a36dbd8a666fa349488b4dc *R/Stage1.R
 a038a12564df543aed002d9b2a94437d *R/Stage2.R
-4c61a738443feeb8e05c4efa5541c6b8 *R/Strata.notebook.R
+089f8c79f89c43ed09729846cc934f35 *R/Strata.notebook.R
 b3e60deafe02f28076075266d0aa1f93 *R/globals.R
 ba872f45756bfcaf20c112dcda048b0c *R/mergeDatasets.R
 f0d88090da013bced02b7bf84e9ae44b *data/NorwayExample.RData
 68f9f262ae9a48e17d84e9aea7242261 *data/NorwayExample_PSU.RData
 67cc11afda5fa695c1332151519628c2 *data/NorwayExample_Strata.RData
 d72f402961924b311989ede41e94e713 *inst/etc/menus.txt
-1ed1ca5b110626b40780ef449af073cf *man/Data.Rd
-b56c213636ae1392508b11866fb13a36 *man/PSUdata.Rd
-55f40d467977d501cfc6829910fe4508 *man/RcmdrPlugin.sampling-package.Rd
-0329ff1ad2a71040cb924e3af3d95e67 *man/RcmdrPlugin.sampling.Rd
+a4724709fbc0adb9a043e419544922cf *man/Data.Rd
+ec6a2ee7f836b0eeb70580cc749776a4 *man/PSUdata.Rd
+728110a262d40002bc0856262bf01ed9 *man/RcmdrPlugin.sampling-package.Rd
+e45f2eb3ecb249370ff9574127e4b01b *man/RcmdrPlugin.sampling.Rd
 5d05fafd796d28d986e1fba4a1e19cd7 *man/Stratadata.Rd

NAMESPACE

@@ -1,6 +1,7 @@
 # last modified 16 april 2013
 
 
-import(Rcmdr, lpSolve, sampling, MASS, tcltk)
+import(Rcmdr, lpSolve, sampling, MASS)
+importFrom(tcltk, tkfont.create, ttkcombobox, tkProgressBar, setTkProgressBar)
 
 exportPattern("^[^\\.]")

R/SRS.notebook.R

@@ -3,8 +3,6 @@
 ######## Author Susie Jentoft
 
 SRS.notebook<-function() {
-	library(sampling)
-	library(lpSolve)
 	initializeDialog(title=gettextRcmdr("One-Stage Simple Random Sample"))
 	.activeDataSet <- ActiveDataSet()
 	sizedefault <- ifelse(nrow(get(.activeDataSet))>=200, 100, round(nrow(get(.activeDataSet))/2))

R/Strata.notebook.R

@@ -4,8 +4,6 @@
 
 
 Strata.notebook<-function() {
-	library(sampling)
-
 	initializeDialog(title=gettextRcmdr("One-Stage Stratified Sample"))
 	.activeDataSet <- ActiveDataSet()
 	vars<-names(get(.activeDataSet))

man/Data.Rd

@@ -4,7 +4,7 @@
 \title{Secondary Sampling Unit Data Set}
 \description{
  An example data set from Norway containing individuals within postal codes in 1 municipality (Fylke)}
-\usage{NorwayExample}
+\usage{NOrwayExample}
 \format{A data set containing 1000 individuals in Oslo, Norway. Each 
   person has a gender/age indicator and are allocated to a postal code region.}
 \source{www.ssb.no}

man/PSUdata.Rd

@@ -6,7 +6,7 @@
  An example data set from Norway containing population sizes in postal codes}
 \usage{NorwayExample_PSU}
 \format{A data set containing 944 postal code units for Norway. Each 
-  unit is allocated to a municipality and has a population size 
+  unit is allocated to a municipality (Fylke) and has a population size 
   indicator with gender/age demographic break-down.}
 \source{www.ssb.no}
 \keyword{ datasets }

man/RcmdrPlugin.sampling-package.Rd

@@ -2,12 +2,12 @@
 \alias{RcmdrPlugin.sampling-package}
 \alias{RcmdrPlugin.sampling}
 \docType{package}
-\title{Sampling for surveys}
+\title{Help with sampling}
 \description{This package provides a range of tools to assist with the sampling 
  process for official statistical surveys. Tools include programs to calculate 
- sample sizes and selecting samples in 1- or 2-stages.
+ sample sizes, selecting a 2-stage sample, importing a SAS dataset.
  The package is based on the work completed as part of EHES under the package:
- RcdmrPlugin.EHESsampling. The EHES Pilot project has received funding from the 
+ RcmdrPlugin.EHESsampling. The EHES Pilot project has received funding from the 
  European Commission and DG Sanco. The views expressed here are those of the 
  authors and they do not represent Commission's official position.}
 \details{
@@ -19,5 +19,6 @@ Date: \tab 2012-10-23\cr
 License: \tab GPL\cr
 LazyLoad: \tab yes\cr}
 }
-\author{Susie Jentoft and Johan Heldal}
+\author{Susie Jentoft and Johan Heldal\cr
+Maintainer: susie.jentoft@ssb.no}
 \keyword{ package }

man/RcmdrPlugin.sampling.Rd

@@ -34,5 +34,7 @@
 \description{This provides tools to assist with official statistical Surveys, including calculating sample sizes and sampling with a 2-stage design.}
 \references{see the EHES manual published on the EHES website:
 http://www.ehes.info}
-\author{Susie Jentoft and Johan Heldal}
+\author{Susie Jentoft and Johan Heldal
+
+Maintainer: susie.jentoft@ssb.no}
 \keyword{ survey }