Skip to content

Commit

Permalink
Merge branch 'master' of github.com:config-i1/greybox
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan Svetunkov committed Jan 16, 2024
2 parents 0141e87 + 2e15a38 commit bc2eea5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: greybox
Type: Package
Title: Toolbox for Model Building and Forecasting
Version: 2.0.1.41001
Date: 2023-11-07
Version: 2.0.1.41002
Date: 2024-01-10
Authors@R: c(person("Ivan", "Svetunkov", email = "[email protected]", role = c("aut", "cre"),
comment="Lecturer at Centre for Marketing Analytics and Forecasting, Lancaster University, UK"),
person("Yves R.", "Sagaert", role = c("ctb"),
Expand Down
3 changes: 2 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
greybox v2.0.1 (Release data: 2023-11-13)
greybox v2.0.1 (Release data: 2024-01-10)

Changes:
* Corrected how the number of parameters is calculated in alm() for loss=c("MSE","MAE","HAM") and respective distribution=c("dnorm","dlaplace","ds").

Bugfixes:
* lmCombine() and lmDynamic() now return loss parameter.
* Fixed a weird bug in vcov.alm(), where instead of inverting Fisher Information, the function would return it as is. This did not apply to all cases, but could have appeared in some situations, when Choleski decomposition would fail.


greybox v2.0.0 (Release data: 2023-09-15)
Expand Down
6 changes: 2 additions & 4 deletions R/methods.R
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,7 @@ vcov.alm <- function(object, bootstrap=FALSE, ...){
vcov <- diag(1e+100,nVariables);
}
else{
vcov <- FIMatrix;
vcov <- vcovMatrixTry;
}
}
else{
Expand Down Expand Up @@ -4097,8 +4097,6 @@ predict.almari <- function(object, newdata=NULL, interval=c("none", "confidence"
matrixOfxreg <- matrixOfxreg[,parametersNames,drop=FALSE];
}

h <- nrow(matrixOfxreg);

if(object$distribution=="dbeta"){
parametersNames <- substr(parametersNames[1:(length(parametersNames)/2)],8,nchar(parametersNames));
}
Expand All @@ -4116,8 +4114,8 @@ predict.almari <- function(object, newdata=NULL, interval=c("none", "confidence"

if(!is.matrix(matrixOfxreg)){
matrixOfxreg <- matrix(matrixOfxreg,ncol=1);
h <- nrow(matrixOfxreg);
}
h <- nrow(matrixOfxreg);

if(h==1){
matrixOfxreg <- matrix(matrixOfxreg, nrow=1);
Expand Down

0 comments on commit bc2eea5

Please sign in to comment.