[Rsiena-commits] r7 - in pkg/RSiena: . R man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Aug 2 15:51:39 CEST 2009
Author: ripleyrm
Date: 2009-08-02 15:51:38 +0200 (Sun, 02 Aug 2009)
New Revision: 7
Added:
pkg/RSiena/configure.win
pkg/RSiena/man/installGui.Rd
Modified:
pkg/RSiena/DESCRIPTION
pkg/RSiena/NAMESPACE
pkg/RSiena/R/phase1.r
pkg/RSiena/R/siena01.r
pkg/RSiena/R/zzz.R
pkg/RSiena/man/RSiena-package.Rd
pkg/RSiena/man/siena07.Rd
Log:
Added installGui and pick up siena gui installer.
Modified: pkg/RSiena/DESCRIPTION
===================================================================
--- pkg/RSiena/DESCRIPTION 2009-08-01 21:15:38 UTC (rev 6)
+++ pkg/RSiena/DESCRIPTION 2009-08-02 13:51:38 UTC (rev 7)
@@ -1,8 +1,8 @@
Package: RSiena
Type: Package
Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.0.3
-Date: 2009-07-30
+Version: 1.0.4
+Date: 2009-08-02
Author: Various
Depends: R (>= 2.7.0)
Imports: Matrix
@@ -14,4 +14,4 @@
LazyLoad: yes
LazyData: yes
URL: http://www.stats.ox.ac.uk/~snijders/siena
-Packaged: 2009-07-30 20:55:58 UTC; ruth
+Packaged: 2009-08-02 13:34:06 UTC; ruth
Modified: pkg/RSiena/NAMESPACE
===================================================================
--- pkg/RSiena/NAMESPACE 2009-08-01 21:15:38 UTC (rev 6)
+++ pkg/RSiena/NAMESPACE 2009-08-02 13:51:38 UTC (rev 7)
@@ -2,7 +2,8 @@
export(coCovar, coDyadCovar, getEffects, model.create, print01Report,
siena01Gui, siena07, sienaCompositionChange,
sienaCompositionChangeFromFile, sienaDataCreate, sienaDataCreateFromSession,
-sienaGroupCreate, sienaNet, sienaNodeSet, simstats0c, varCovar, varDyadCovar)
+sienaGroupCreate, sienaNet, sienaNodeSet, simstats0c, varCovar, varDyadCovar,
+ installGui)
import(Matrix)
Modified: pkg/RSiena/R/phase1.r
===================================================================
--- pkg/RSiena/R/phase1.r 2009-08-01 21:15:38 UTC (rev 6)
+++ pkg/RSiena/R/phase1.r 2009-08-02 13:51:38 UTC (rev 7)
@@ -123,8 +123,7 @@
use <- !z$fixed & npos < 5
z$epsilon[use] <- pmin(100.0 * z$scale[use], z$epsilon[use])
z$epsilon[use] <- pmax(0.1 * z$scale[use], z$epsilon[use])
- Report(c("New epsilon =", paste(" ", z$epsilon[use], collapse=""),
- "\n"), sep="", cf, fill=80)
+ Report(c("New epsilon =", paste(" ", z$epsilon[use], collapse=""), ".\n"), sep="", cf, fill=80)
if (z$repeatsForEpsilon <= 4)
{
Report("Change value of epsilon and restart Phase 1.\n", cf)
Modified: pkg/RSiena/R/siena01.r
===================================================================
--- pkg/RSiena/R/siena01.r 2009-08-01 21:15:38 UTC (rev 6)
+++ pkg/RSiena/R/siena01.r 2009-08-02 13:51:38 UTC (rev 7)
@@ -8,6 +8,23 @@
# * Description: This module contains the code for the gui for creation of a
# * Siena data object.
# *****************************************************************************/
+installGui <- function()
+{
+ if (.Platform$OS.type =="windows")
+ {
+ tmp <- list.files(pkgpath)
+ if (subs <- grep("sienaguisetup", tmp))
+ {
+ filename=paste(pkgpath, "/", tmp[subs], sep="", collapse="")
+ system(filename)
+ }
+ }
+ else
+ {
+ stop("Gui only needs installing on Windows: on Linux use sienascript")
+ }
+}
+
siena01Gui <- function()
{
## DONE (FALSE) ## this is so we can exit cleanly
Modified: pkg/RSiena/R/zzz.R
===================================================================
--- pkg/RSiena/R/zzz.R 2009-08-01 21:15:38 UTC (rev 6)
+++ pkg/RSiena/R/zzz.R 2009-08-02 13:51:38 UTC (rev 7)
@@ -12,6 +12,7 @@
imagepath <- ''
##csvpath <- ''
## or .onAttach?
+pkgpath <- ''
.onLoad <- function(libname,pkgname){
# dllpath <<- if (nzchar(.Platform$r_arch))
## file.path(libname, pkgname, "libs", .Platform$r_arch,
@@ -21,12 +22,13 @@
# paste('RSiena', .Platform$dynlib.ext, sep=''))
# # data('sysdata',package='RSiena')
imagepath <<- file.path(libname, pkgname, paste('ilcampo.gif'))
+ pkgpath<<- file.path(libname, pkgname)
+## cat(pkgpath,'\n')
## csvpath<<- file.path(libname,pkgname)
# library.dynam("RSiena",package=pkgname)
# cat (libname,pkgname,'\n')
}
-## not used yet.
.onUnload <- function(libpath) {
library.dynam.unload("RSiena", libpath)
}
@@ -35,3 +37,5 @@
#{
# cat(libpath,'\n')
#}
+
+
Added: pkg/RSiena/configure.win
===================================================================
--- pkg/RSiena/configure.win (rev 0)
+++ pkg/RSiena/configure.win 2009-08-02 13:51:38 UTC (rev 7)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+echo " getting gui installer"
+allok=yes
+echo 'download.file("http://www.stats.ox.ac.uk/~ruth/sienaversion.txt",
+"inst/sienaversion.txt", mode="w")'| ${R_HOME}/bin/R --vanilla --slave
+
+if [ ! -e inst/sienaversion.txt ]; then
+ allok=no
+else
+ echo '{version <- scan("inst/sienaversion.txt", what="character"); file1 <- paste("sienaguisetup", version, ".exe", sep="", collapse=""); file2 <- paste("http://www.stats.ox.ac.uk/~ruth/", file1, sep="", collapse=""); file3 <- paste("inst/",file1, sep="", collapse="");download.file(file2,file3,mode="wb")}' | ${R_HOME}/bin/R --vanilla --slave
+fi
+
+exit 0
Modified: pkg/RSiena/man/RSiena-package.Rd
===================================================================
--- pkg/RSiena/man/RSiena-package.Rd 2009-08-01 21:15:38 UTC (rev 6)
+++ pkg/RSiena/man/RSiena-package.Rd 2009-08-02 13:51:38 UTC (rev 7)
@@ -30,8 +30,8 @@
\tabular{ll}{
Package: \tab RSiena\cr
Type: \tab Package\cr
-Version: \tab 1.0.3\cr
-Date: \tab 2009-07-30\cr
+Version: \tab 1.0.4\cr
+Date: \tab 2009-08-02\cr
License: \tab GPL-2 \cr
LazyLoad: \tab yes\cr
}
Added: pkg/RSiena/man/installGui.Rd
===================================================================
--- pkg/RSiena/man/installGui.Rd (rev 0)
+++ pkg/RSiena/man/installGui.Rd 2009-08-02 13:51:38 UTC (rev 7)
@@ -0,0 +1,21 @@
+\name{installGui}
+\Rdversion{1.1}
+\alias{installGui}
+\title{
+Function to start up the installer for the standalone Gui.
+}
+\description{
+Starts the installer for the standalone version of RSiena. Only for Windows.
+}
+\usage{
+installGui()
+}
+\value{ None.
+}
+\references{See \url{http://www.stats.ox.ac.uk/~snijders/siena/}}
+\author{Ruth Ripley }
+
+\examples{
+\dontrun{installGui()}
+}
+\keyword{ misc }
Modified: pkg/RSiena/man/siena07.Rd
===================================================================
--- pkg/RSiena/man/siena07.Rd 2009-08-01 21:15:38 UTC (rev 6)
+++ pkg/RSiena/man/siena07.Rd 2009-08-02 13:51:38 UTC (rev 7)
@@ -21,8 +21,8 @@
\item{useCluster}{Boolean: whether to use a cluster of processes}
\item{noClusters}{Number of processes to use if useCluster is TRUE}
\item{initC}{Boolean: set to TRUE if the simulation will use C
- routines. Only for use if using multiple processors, to ensure all
- copies are initialised at the start of phase 3}
+ routines (currently always needed). Only for use if using
+ multiple processors, to ensure all copies are initialised correctly.}
\item{tt}{A \code{tcltk} toplevel window. Used if called from the
model options screen.}
\item{parallelTesting}{Boolean. If TRUE, sets up random numbers to
More information about the Rsiena-commits
mailing list