Skip to content

Commit

Permalink
updated the R-package files
Browse files Browse the repository at this point in the history
  • Loading branch information
mlampros committed Aug 14, 2018
1 parent 4ca872e commit 4470326
Show file tree
Hide file tree
Showing 12 changed files with 8 additions and 704 deletions.
4 changes: 2 additions & 2 deletions R-package/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Package: RGF
Type: Package
Title: Regularized Greedy Forest
Version: 1.0.5
Date: 2018-08-09
Authors@R: c( person("Lampros", "Mouselimis", email = "mouselimislampros@gmail.com", role = c("aut", "cre")), person("Ryosuke", "Fukatani", role = "cph", comment = "Author of the python wrapper of the 'Regularized Greedy Forest' machine learning algorithm"), person("Tong", "Zhang", role = "cph", comment = "Author of the 'Regularized Greedy Forest' and of the Multi-core implementation of Regularized Greedy Forest machine learning algorithm"), person("Rie", "Johnson", role = "cph", comment = "Author of the 'Regularized Greedy Forest' machine learning algorithm") )
Date: 2018-08-14
Authors@R: c( person("Lampros", "Mouselimis", email = "mouselimislampros@gmail.com", role = c("aut", "cre")), person("Ryosuke", "Fukatani", role = "cph", comment = "Author of the python wrapper of the 'Regularized Greedy Forest' machine learning algorithm"), person("Nikita", "Titov", role = "cph", comment = "Author of the python wrapper of the 'Regularized Greedy Forest' machine learning algorithm"), person("Tong", "Zhang", role = "cph", comment = "Author of the 'Regularized Greedy Forest' and of the Multi-core implementation of Regularized Greedy Forest machine learning algorithm"), person("Rie", "Johnson", role = "cph", comment = "Author of the 'Regularized Greedy Forest' machine learning algorithm") )
Maintainer: Lampros Mouselimis <mouselimislampros@gmail.com>
BugReports: https://github.com/RGF-team/rgf/issues
URL: https://github.com/RGF-team/rgf/tree/master/R-package
Expand Down
6 changes: 3 additions & 3 deletions R-package/NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The RGF R package was integrated in the home repository for the Regularized Gree

* We modified the license from GPL-3 to MIT to go in accordance with the new structure of the *rgf_python* package. The package includes two files : *LICENSE* (for the RGF R package) and *LICENSE.note* (for the *RGF*, *FastRGF* and *rgf_python* packages).
* We added the following new features of RGF estimators : *feature_importances_* and *dump_model()*
* We modified the README.md file and especially the installation instructions for all operating systems (Linux, Macintosh, Windows)
* We modified the README.md file and especially the installation instructions for all operating systems (Linux, Mac OS X, Windows)
* We created an R6 class (*Internal_class*) for all secondary functions which are used in RGF and FastRGF


Expand All @@ -20,7 +20,7 @@ The RGF R package was integrated in the home repository for the Regularized Gree

## RGF 1.0.2

We commented the example(s) and test(s) related to the *dgCMatrix_2scipy_sparse* function [ *if (Sys.info()["sysname"] != 'Darwin')* ], because the *scipy-sparse* library on CRAN is not upgraded and the older version includes a bug (*TypeError : could not interpret data type*). This leads to an error on *Macintosh* ( *reference* : https://github.com/scipy/scipy/issues/5353 ).
We commented the example(s) and test(s) related to the *dgCMatrix_2scipy_sparse* function [ *if (Sys.info()["sysname"] != 'Darwin')* ], because the *scipy-sparse* library on CRAN is not upgraded and the older version includes a bug (*TypeError : could not interpret data type*). This leads to an error on *Mac OS X* ( *reference* : https://github.com/scipy/scipy/issues/5353 ).


## RGF 1.0.1
Expand All @@ -30,4 +30,4 @@ We added links to the GitHub repository (master repository, issues).

## RGF 1.0.0

Initial version.
Initial version.
4 changes: 2 additions & 2 deletions R-package/R/zzz.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# temporary startup message beginning from version 1.0.3 [ SEE : http://r-pkgs.had.co.nz/r.html#r-differences ]

.onAttach <- function(libname, pkgname) {
packageStartupMessage("Begninning from version 1.0.3 the 'dgCMatrix_2scipy_sparse' function was renamed to 'TO_scipy_sparse' and now accepts either a 'dgCMatrix' or a 'dgRMatrix' as input. The appropriate format for the 'RGF' package in case of sparse matrices is the 'dgCMatrix' format (scipy.sparse.csc_matrix)")

packageStartupMessage("Beginning from version 1.0.3 the 'dgCMatrix_2scipy_sparse' function was renamed to 'TO_scipy_sparse' and now accepts either a 'dgCMatrix' or a 'dgRMatrix' as input. The appropriate format for the 'RGF' package in case of sparse matrices is the 'dgCMatrix' format (scipy.sparse.csc_matrix)")
}
2 changes: 1 addition & 1 deletion R-package/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ sudo python setup.py install



#### **Macintosh OSX** [ installed / tested on Python >= 3.4 ]
#### **Mac OS X** [ installed / tested on Python >= 3.4 ]

<br>

Expand Down
141 changes: 0 additions & 141 deletions R-package/man/FastRGF_Classifier.Rd

This file was deleted.

129 changes: 0 additions & 129 deletions R-package/man/FastRGF_Regressor.Rd

This file was deleted.

14 changes: 0 additions & 14 deletions R-package/man/Internal_class.Rd

This file was deleted.

Loading

0 comments on commit 4470326

Please sign in to comment.