Changes between Version 1 and Version 2 of Rprojects

Timestamp:

Jan 29, 2016, 9:05:23 AM (9 years ago)

Author:

Pedro Gea

Comment:

--

Rprojects

@@ -6 +6 @@
 #!div style="width:15%; float:left; clear:none; margin-right:1em; background:#ffb; border:1px solid #b00; padding-left:1em; padding-right:1em"
 [wiki:WikiStart Home] [[BR]] [[BR]]
-'''Software''' [[BR]] [wiki:Download Download] [[BR]] [wiki:Installation Installation] [[BR]] [wiki:Documentation Documentation] [[BR]] [wiki:Packages Packages] [[BR]] [[BR]]
-'''TOL Project''' [[BR]] [wiki:TolDevelopment Development] [[BR]] [wiki:TolPeople Contributors] [[BR]] [[BR]]
-'''Others''' [[BR]] [wiki:Rprojects R-Projects] [[BR]] [https://mmm.tol-project.org MMS] [[BR]] [wiki:TolGrid TOLGrid]
+'''TOL''' [[BR]] [wiki:Software Software] [[BR]] [wiki:Download Download] [[BR]] [wiki:Installation Installation] [[BR]] [wiki:Packages Packages] [[BR]] [wiki:OTAN OTAN] [[BR]] [[BR]]
+'''TOL Project''' [[BR]] [wiki:About About TOL] [[BR]] [wiki:Manuals Manuals] [[BR]] [wiki:Development Development] [[BR]] [wiki:Rprojects R-Projects] [[BR]] [[BR]]
+'''Other Links''' [[BR]] [wiki:TracGuide Trac Guide] [[BR]] [wiki:WikiTree Wiki Tree] [[BR]] [https://mms.tol-project.org MMS]  
 }}}
 {{{
-#!div style="margin-left:20%; margin-right:0%; padding-left:2em; padding-right:2em"
+#!div style="margin-left:20%; margin-right:20%; padding-left:2em; padding-right:2em"
 {{{
 #!comment
@@ -23 +23 @@
 Download and installation details are shown below: [#Installation]
 
-== R-Packages ==
+== R Packages ==
 
 Currently there are three R-packages:
@@ -33 +33 @@
 === tolBasis ===
 
-{{{tolBasis}}} is the main package for using TOL from R. It is the basis on which TOL in R developments are supported. 
+{{{tolBasis}}} is the main package for using TOL from R. It is the basis on which ''TOL in R'' developments are supported. 
 
 There is not necessary a TOL software installation to be used.
@@ -55 +55 @@
 {{{tolKit}}} is a package with some TOL utilities adapted to be used in R as usual.
 
-This package needs to the previous packages: {{{tolBasis}}} and {{{tolRlink}}}.
+This package requires the previous packages: {{{tolBasis}}} and {{{tolRlink}}}.
 
 Current version imports TOL funcionts: {{{Estimate}}} and {{{CalcForecasting}}}.
@@ -65 +65 @@
 
 There are different ways to install these developments:
- * install the compiled packages (zip files for Windows)
- * download the source (tar.gz file) and compile it.
-
-The package {{{tolBasis}}} is already available at CRAN: [https://cran.r-project.org/web/packages/tolBasis/index.html tolBasis] and can be installed as usual:
-{{{
-#!ruby
-install.packages("tolBasis")
-}}}
+ * as usual from CRAN repositories (currently only tolBasis is available),
+ * downloading and installing the compiled packages (zip files for Windows),
+ * downloading the source (tar.gz file) and compiling it locally.
 
 === Dependencies ===
@@ -91 +86 @@
 }}}
 
- * {{{tolKit}}} only depends on: {{{tolLink}}}
+ * {{{tolKit}}} only depends on: {{{tolRlink}}}
 
-=== Installation from ZIP files (Windows) ===
+=== Installation from CRAN ===
 
---La mejor manera actualmente de instalar los paquetes en Windows es descargar los paquetes ya compilados e instalarlos en R.
+The package {{{tolBasis}}} is already available at CRAN: [https://cran.r-project.org/web/packages/tolBasis/index.html tolBasis] and can be installed as usual:
+{{{
+#!ruby
+install.packages("tolBasis")
+}}}
 
---Los paquetes en formato ZIP (con los binarios para Windows) se pueden descargar desde:
- * [export:tolp/Rprojects/tolBasis_1.0.zip tolBasis_1.0.zip]
- * [export:tolp/Rprojects/tolLink_1.0.zip tolLink_1.0.zip]
- * [export:tolp/Rprojects/tolKit_1.0.zip tolKit_1.0.zip]
+=== Installation from compiled packages (Windows) ===
 
---Para instalar los archivos ZIP podemos usar la opción {{{"Instalar paquete(s) a partir de archivos zip locales..."}}} del menú {{{"Paquetes"}}}.
+The compiled packages for Windows (ZIP files) can be downloaded from:
+ * [export:tolp/Rprojects/tolBasis_1.1.zip tolBasis_1.1.zip]
+ * [export:tolp/Rprojects/tolRlink_1.0.zip tolRlink_1.0.zip]
+ * [export:tolp/Rprojects/tolKit_1.1.zip tolKit_1.1.zip]
 
+To install them in R, can be use the option {{{"install package(s) from local zip files..."}}} from menu {{{"Packages"}}} or use R sentences as:
+{{{
+#!ruby
+# change <filename> for the route of each zip file
+install.packages(<filename>, repos=NULL)
+}}}
 
 === Installation from source ===
 
+The packages can be installed from source using
+{{{
+#!ruby
+# change <package_url> for the url of each package
+install.packages(<package_url>, repos=NULL, type="source")
+}}}
 
---Para descargar el código utilizamos SVN:
+The current urls of source files (tar.gz) are:
+
+ * [https://www.tol-project.org/svn/tolp/Rprojects/tolBasis_1.1.tar.gz]
+ * [https://www.tol-project.org/svn/tolp/Rprojects/tolRlink_1.0.tar.gz]
+ * [https://www.tol-project.org/svn/tolp/Rprojects/tolKit_1.1.tar.gz]
+
+
+For other versions see directly the folder: [https://www.tol-project.org/svn/tolp/Rprojects svn:Rprojects]
+
+
+=== Downloading source ===
+
+SVN can be used for download the developping source of these packages:
 
 {{{
@@ -114 +137 @@
 }}}
 
---Cámbiese la ruta de destino por la que considere.
+Change the destination folder for your choice.
 
---Para instalar los paquetes desde el código, estableceremos el directorio de trabajo con la ruta donde descargamos los paquetes
-y los instalaremos como sigue:
+Remember that in order to compile {{{tolRlink}}} a compatible TOL installation is required.
 
-{{{
-#!ruby
-setwd("c:/users/<user>/svn/tolp/Rprojects")
-# Cambiese la ruta adecuadamente
-install.packages("tolBasis", repos=NULL, type="source")
-install.packages("tolLink", repos=NULL, type="source")
-install.packages("tolKit", repos=NULL, type="source")
-}}}
 
---Nótese que para compilar {{{tolLink}}} necesitamos una instalación válida (acorde a nuestro sistema) de TOL-GNU.
-
---En la instalación de TOL-GNU asegúrese también de instalar las librerías y las cabeceras para C/C++. 
-Éstas se buscarán en el directorio de instalación según la ruta especificada en la variable de entorno: {{{TOLGNU_ROOT}}}. 
-Véase el archivo: {{{tolLink/src/Makevars}}}
-