Fixing a bug with ts() indices

config-i1 · config-i1 · commit 75d9c4ae42fb · 2025-04-14T16:11:58.000+01:00
diff --git a/R/adam.R b/R/adam.R
@@ -8053,7 +8053,7 @@ forecast.adam <- function(object, h=10, newdata=NULL, occurrence=NULL,
         # ts structure
         yForecastStart <- time(actuals(object))[obsInSample]+deltat(actuals(object));
         yFrequency <- frequency(actuals(object));
-        yForecastIndex <- yIndex[obsInSample]+as.numeric(diff(tail(yIndex,2)))*c(1:h);
+        yForecastIndex <- yIndex[obsInSample]+deltat(yIndex)*c(1:h);
     }
     else{
         # zoo
diff --git a/R/adamGeneral.R b/R/adamGeneral.R
@@ -180,7 +180,7 @@ parametersChecker <- function(data, model, lags, formulaToUse, orders, constant=
         yIndexDiff <- diff(tail(yIndex,2));
         yForecastStart <- yIndex[obsInSample]+yIndexDiff;
         if(any(yClasses=="ts")){
-            yForecastIndex <- yIndex[obsInSample]+as.numeric(yIndexDiff)*c(1:max(h,1));
+            yForecastIndex <- yIndex[obsInSample]+deltat(yIndex)*c(1:max(h,1));
         }
         else{
             yForecastIndex <- yIndex[obsInSample]+yIndexDiff*c(1:max(h,1));
diff --git a/smooth.Rproj b/smooth.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: f8f33844-318a-42de-9bed-71e43b9ac780
 
 RestoreWorkspace: Default
 SaveWorkspace: Default

Original file line number	Diff line number	Diff line change
`@@ -8053,7 +8053,7 @@ forecast.adam <- function(object, h=10, newdata=NULL, occurrence=NULL,`
`8053`	`8053`	`# ts structure`
`8054`	`8054`	`yForecastStart <- time(actuals(object))[obsInSample]+deltat(actuals(object));`
`8055`	`8055`	`yFrequency <- frequency(actuals(object));`
`8056`		`- yForecastIndex <- yIndex[obsInSample]+as.numeric(diff(tail(yIndex,2)))*c(1:h);`
	`8056`	`+ yForecastIndex <- yIndex[obsInSample]+deltat(yIndex)*c(1:h);`
`8057`	`8057`	`}`
`8058`	`8058`	`else{`
`8059`	`8059`	`# zoo`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ parametersChecker <- function(data, model, lags, formulaToUse, orders, constant=`
`180`	`180`	`yIndexDiff <- diff(tail(yIndex,2));`
`181`	`181`	`yForecastStart <- yIndex[obsInSample]+yIndexDiff;`
`182`	`182`	`if(any(yClasses=="ts")){`
`183`		`- yForecastIndex <- yIndex[obsInSample]+as.numeric(yIndexDiff)*c(1:max(h,1));`
	`183`	`+ yForecastIndex <- yIndex[obsInSample]+deltat(yIndex)*c(1:max(h,1));`
`184`	`184`	`}`
`185`	`185`	`else{`
`186`	`186`	`yForecastIndex <- yIndex[obsInSample]+yIndexDiff*c(1:max(h,1));`