[Rsiena-commits] r351 - in pkg/RSienaTest: R doc

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

Author: tomsnijders
Date: 2020-09-18 16:27:31 +0200 (Fri, 18 Sep 2020)
New Revision: 351

Modified:
   pkg/RSienaTest/R/sienaDataCreateFromSession.r
   pkg/RSienaTest/doc/RSiena_Manual.pdf
   pkg/RSienaTest/doc/RSiena_Manual.tex
Log:
Try once more, to interrupt the days-long "building".

Modified: pkg/RSienaTest/R/sienaDataCreateFromSession.r
===================================================================
--- pkg/RSienaTest/R/sienaDataCreateFromSession.r	2020-09-16 14:04:33 UTC (rev 350)
+++ pkg/RSienaTest/R/sienaDataCreateFromSession.r	2020-09-18 14:27:31 UTC (rev 351)
@@ -16,10 +16,9 @@
 }
 
 ##@sessionFromFile siena01/DataCreate
-sessionFromFile <- function(loadfilename, tk=FALSE)
+sessionFromFile <- function(loadfilename)
 {
 	## browser()
-	## require(tcltk)
 	dots <- max(c(0, gregexpr(".", loadfilename, fixed=TRUE)[[1]]))
 	if (dots > 1)
 	{
@@ -60,18 +59,8 @@
 	}
 	else
 	{
-		if (tk)
-		{
-			tkmessageBox(message="Can only read csv, txt",
-				"(tab delimited) or prn (space delimiited) files",
-				icon="error")
-			return()
-		}
-		else
-		{
-			stop("Can only read csv, txt (tab delimited)",
+		stop("Can only read csv, txt (tab delimited)",
 				"or prn (space delimiited) files")
-		}
 	}
 	session
 }
@@ -79,7 +68,6 @@
 ##@readInFiles siena01/DataCreate
 readInFiles <- function(session, edited, files=NULL)
 {
-	## require(tcltk)
 	noFiles <- nrow(session)
 	if (!any(edited))
 	{
@@ -137,7 +125,6 @@
 	files=NULL, getDocumentation=FALSE)
 {
 	session <- NULL
-	## require(tcltk)
 	##@turnoffwarn internal sienaDataCreateFromSession
 	turnoffwarn <- function()
 	{
@@ -697,14 +684,8 @@
 		obj <- unlist(lapply(objnames, strsplit, split=" "))
 		if (any(duplicated(obj)))
 		{
-			if (is.null(filename))
-			{
-				tkmessageBox(message = paste('Duplicate names',
+			stop(paste('Duplicate names',
 						obj[duplicated(obj)]))
-			}
-			else
-				stop(paste('Duplicate names',
-						obj[duplicated(obj)]))
 		}
 		objlist <- mget(obj, as.environment(-1))
 		nodeSetList <- mget(ActorSets, as.environment(-1))

Modified: pkg/RSienaTest/doc/RSiena_Manual.pdf
===================================================================
(Binary files differ)

Modified: pkg/RSienaTest/doc/RSiena_Manual.tex
===================================================================
--- pkg/RSienaTest/doc/RSiena_Manual.tex	2020-09-16 14:04:33 UTC (rev 350)
+++ pkg/RSienaTest/doc/RSiena_Manual.tex	2020-09-18 14:27:31 UTC (rev 351)
@@ -880,14 +880,17 @@
             For Mac, you will also need \sfn{X11}, because this is
             required for \sfn{tcltk}. See the FAQ list for R on Mac,
 	\item	Install the package \RS or \sfn{RSienaTest}, with dependencies.
-            The other packages used are \sfn{tcltk}, \sfn{parallel}
+            The other packages used are  \sfn{parallel}
             and \sfn{tools} (all included in the basic \R distribution);
             \sfn{Matrix}, \sfn{MASS}, \sfn{lattice}, \sfn{codetools}
             (`recommended' packages included in most R distributions);
             \sfn{network} and \sfn{xtable}; and, for \sfn{RSienaTest},
-            \sfn{RUnit}.
+            \sfn{RUnit}. \sfn{tcltk} is optional.
             For goodness of fit testing it will be useful also to
-            install \sfn{sna} and \sfn{igraph}.\\
+            install \sfn{sna} and \sfn{igraph}.
+            For constructing the vignette in \RS the
+            packages \sfn{knitr} and \sfn{rmarkdown} are used.
+            
             You can just install \RS and the other packages
             in the regular way from CRAN.
             If you want to have detailed information about
@@ -894,8 +897,10 @@
             what is available at CRAN, go to\\
 \url{http://cran.r-project.org/web/packages/RSiena/} .\\
             However, it is advisable to have the latest version of \RS
-            or \sfn{RSienaTest} from R-Forge or the \SI website.
+            or \sfn{RSienaTest} from GitHub, R-Forge or the \SI website.
             You can go to\\
+            \url{https://github.com/snlab-nl/rsiena/releases}\\
+            or to\\
                \url{http://r-forge.r-project.org/R/?group_id=461} \\
                or to\\
               \url{http://www.stats.ox.ac.uk/~snijders/siena/siena_downloads.htm}\\
@@ -905,10 +910,35 @@
             in \Rn,
             via the drop-down menu in the \R console, or in command mode which for Mac is
             the `terminal'.
-            If a binary file is available (\texttt{.zip} for Windows, \texttt{.tgz} for Mac),
+            If you downloaded a binary file (\texttt{.zip} for Windows, 
+            \texttt{.tgz} for Mac),
             then using the binary is recommended.
             Installation from binary is much faster than installation from source.
 
+            Installation from the GitHub can be done as follows.
+        Download  the latest release from 
+        \url{https://github.com/snlab-nl/rsiena/releases/}.
+Once the file has been downloaded, unzip it, and install the binary 
+as appropriate for your Operating System.
+In the following, perhaps the name of the Downloads folder and 
+the version number have to be amended:
+
+For Windows:
+
+\texttt{install.packages("\url{~/Downloads/rsiena\_AllOS/winOS/RSiena\_1.2.26.zip}", \\
+repos = NULL)}
+
+For Mac:
+
+\texttt{install.packages("\url{~/Downloads/rsiena\_AllOS/macOS/RSiena\_1.2.26.tgz}", \\
+repos = NULL)}
+
+For Unix:
+
+\texttt{install.packages(\\
+"\url{~/Downloads/rsiena\_AllOS/linuxOS/RSiena\_1.2-26\_R\_x86\_64-pc-linux-gnu.tar.gz}",
+ repos = NULL)}
+
             Installation from the R-Forge repository can be done as follows.
             In these commands, \texttt{RSienaTest} can be replaced by \texttt{RSiena}.
             \begin{itemize}