From cb2742f70c8b1fc8776fad6366974fe11c01f9b8 Mon Sep 17 00:00:00 2001 From: l-ramirez-lopez Date: Thu, 21 Jan 2016 12:41:15 +0100 Subject: [PATCH] 1.2 final --- DESCRIPTION | 9 ++------- NEWS | 2 ++ TODO | 45 --------------------------------------------- src/resemble.dll | Bin 1161728 -> 1161728 bytes 4 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 TODO diff --git a/DESCRIPTION b/DESCRIPTION index 318b998..4b8d847 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,13 +2,8 @@ Package: resemble Type: Package Title: Regression and Similarity Evaluation for Memory-Based Learning in Spectral Chemometrics -Version: 1.2.0.9000 -Date: 2015-12-09 -Authors@R: c( - person("Leonardo", "Ramirez-Lopez", email = "ramirez.lopez.leo@gmail.com", - role = c("aut", "cre")), - person("Antoine", "Stevens", role = c("aut")) - ) +Version: 1.2.0 +Date: 2016-01-20 Author: Leonardo Ramirez-Lopez [aut, cre], Antoine Stevens [aut] Maintainer: Leonardo Ramirez-Lopez BugReports: https://github.com/l-ramirez-lopez/resemble/issues diff --git a/NEWS b/NEWS index d9d60d8..c6e499a 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ * 19.03.2013 Hello world! Initial release of the package ## Version 1.2 (alma de coco) +* 19.01.2016 Now it is possible to locally optimize the maximum and minimum + pls factors in wapls1 local regressions. * 09.12.2015 Many thanks to Eva Ampe and Lorenzo Menichetti for their suggestions. * 08.12.2015 A method for better estimates of RMSE values computed for diff --git a/TODO b/TODO deleted file mode 100644 index 182d6c2..0000000 --- a/TODO +++ /dev/null @@ -1,45 +0,0 @@ -## 17.01.2016: Clarify in the documentation that the cores argument works curtrently only for linux systems -## 16.12.2015: Add the GH value to the results, however they are already in ___$pcAnalysis$GH -## 16.12.2015: Optimize the pcProjection function, it is extremely slow when massive datasets are used -## 15.12.2015: Add local optimization of pls.c for wapls1 method wehn "loc_crossval" is used. Easy and important! -## 30.11.2015: orthoDiss retuns "Error: not a matrix" when applied to a single matrix (Xr) -## 30.11.2015: Perform a detailed check of the orthoProjection, plsProjection and pcProjection. -## 18.11.2015: Check documentation. -## 18.11.2015: check the gaussian process function since it retrieves poorer results than in the previous resemble version (only in NNv validation, the predictions are actually good). The scale argument now does something -## different to what it was doing before (scale and centering: both x and y). If at the and stays like that -## check documentation and indicate that both x nd y are centered and scaled - - -## 31.08.2014: There is a bug in the orthoDiss function, when Yr is a matrix containing different variables -It seems to be that works in windows but not in linux? is because the version of R -As an example see the internal code in "soil_contest_exploratory_analysis.R" -pc.dis <- orthoDiss(Xr = data.tr$spec, X2 = data.pred$spec, - Yr = data.tr[,soil.attr[-2]], - pcSelection = list("cumvar", 50), - method = "pls", - local = FALSE, - center = TRUE, scaled = TRUE, - return.all = FALSE, cores = 30) - -On the other hand when method = "pls" or method = "pca" it would be good to include the results from the simEval or the explained variances - -set.seed(1) -pc.proj <- orthoProjection(Xr = matrix(rnorm(length(Yr) * 200), length(Yr), 200), -X2 = matrix(rnorm(length(Yr) * 200), length(Yr), 200), - Yr = Yr, - pcSelection = list("cumvar", 1), - method = "pls", - local = FALSE, - center = TRUE, scaled = TRUE) - - - -pc.dis <- orthoDiss(Xr = matrix(rnorm(length(Yr) * 200), length(Yr), 200), -X2 = matrix(rnorm(length(Yr) * 200), length(Yr), 200), - Yr = rnorm(length(Yr)), - pcSelection = list("cumvar", 1), - method = "pls", - local = FALSE, - center = TRUE, scaled = TRUE, - return.all = FALSE, cores = 3) - diff --git a/src/resemble.dll b/src/resemble.dll index 311c22094c99388c71776cb7eaa034c9a87eb6ac..283452339ebef70f99fcda1dcac8938a661697f8 100644 GIT binary patch delta 84 zcmZqp;@0rRZ9)h0HQ@ylyM3AK_6RoKZoSRedYh^BHgoH3me$*>t+&})Z?m`F=4idm o*?OC+^)`3wZJyTKysfwST5t2W-WJ$;TTs&+WWsiK3&Ed_0Hfa~!T