#> Loading required package: modeltime
#> Finn Submission Info
#> • Experiment Name: finnts_fcst
-#> • Run Name: get_prepped_models-20240429T224931Z
+#> • Run Name: get_prepped_models-20240530T211327Z
#>
#> ℹ Prepping Data
-#> ✔ Prepping Data [1s]
+#> ✔ Prepping Data [955ms]
#>
#> ℹ Creating Model Workflows
-#> ✔ Creating Model Workflows [106ms]
+#> ✔ Creating Model Workflows [100ms]
#>
#> ℹ Creating Model Hyperparameters
-#> ✔ Creating Model Hyperparameters [152ms]
+#> ✔ Creating Model Hyperparameters [144ms]
#>
#> ℹ Creating Train Test Splits
-#> ✔ Creating Train Test Splits [354ms]
+#> ✔ Creating Train Test Splits [349ms]
#>
#> # A tibble: 31 × 4
#> Run_Type Train_Test_ID Train_End Test_End
diff --git a/articles/best-model-selection.html b/articles/best-model-selection.html
index 1456c6b1..68a5860f 100644
--- a/articles/best-model-selection.html
+++ b/articles/best-model-selection.html
@@ -46,7 +46,7 @@
diff --git a/articles/external-regressors.html b/articles/external-regressors.html
index 2c018d07..f954c803 100644
--- a/articles/external-regressors.html
+++ b/articles/external-regressors.html
@@ -46,7 +46,7 @@
diff --git a/articles/feature-engineering.html b/articles/feature-engineering.html
index 99bb217a..3ba19351 100644
--- a/articles/feature-engineering.html
+++ b/articles/feature-engineering.html
@@ -46,7 +46,7 @@
diff --git a/articles/feature-selection.html b/articles/feature-selection.html
index c8c3addb..eb221065 100644
--- a/articles/feature-selection.html
+++ b/articles/feature-selection.html
@@ -46,7 +46,7 @@
diff --git a/articles/finnts.html b/articles/finnts.html
index 12899b25..f780c74b 100644
--- a/articles/finnts.html
+++ b/articles/finnts.html
@@ -46,7 +46,7 @@
@@ -173,8 +173,9 @@ 1. Bring Data#> 8 M1 2013-08-01 9610
#> 9 M1 2013-09-01 8270
#> 10 M1 2013-10-01 9200
-#> # ℹ 110 more rows
-
+#> # ℹ 110 more rows
The above data set contains 4 individual time series, identified using the “id” column.
@@ -183,14 +184,14 @@Before we call the Finn forecast function. Let’s first set up some run information using set_run_info(), this helps log all components of our Finn forecast successfully.
+run_info <- set_run_info( experiment_name = "finn_forecast", run_name = "test_run" )Calling the “forecast_time_series” function is the easiest part. In this example we will be running just two models.
-@@ -151,7 +151,7 @@+@@ -130,7 +130,7 @@# no need to assign it to a variable, since all of the outputs are written to disk :) forecast_time_series( @@ -211,7 +212,7 @@3. Get Forecast Outputs
Initial Finn Outputs
-@@ -138,7 +138,7 @@+@@ -134,7 +134,7 @@finn_output_tbl <- get_forecast_data(run_info = run_info) @@ -220,7 +221,7 @@Initial Finn Outputs
Future Forecast
-@@ -357,7 +357,7 @@+diff --git a/reference/forecast_time_series.html b/reference/forecast_time_series.html index 00c2c310..e97e9510 100644 --- a/reference/forecast_time_series.html +++ b/reference/forecast_time_series.html @@ -23,7 +23,7 @@future_forecast_tbl <- finn_output_tbl %>% dplyr::filter(Run_Type == "Future_Forecast") @@ -230,7 +231,7 @@Future Forecast
Back Test Results
-@@ -174,7 +174,7 @@+diff --git a/reference/final_models.html b/reference/final_models.html index 9a46b4e3..9e9d30f1 100644 --- a/reference/final_models.html +++ b/reference/final_models.html @@ -23,7 +23,7 @@back_test_tbl <- finn_output_tbl %>% dplyr::filter(Run_Type == "Back_Test") @@ -239,7 +240,7 @@Back Test Results
Back Test Best Model per Time Series
-@@ -161,7 +161,7 @@+diff --git a/reference/ensemble_models.html b/reference/ensemble_models.html index b9b91b7e..83e68723 100644 --- a/reference/ensemble_models.html +++ b/reference/ensemble_models.html @@ -23,7 +23,7 @@best_model_tbl <- finn_output_tbl %>% dplyr::filter(Best_Model == "Yes") %>% dplyr::select(Combo, Model_ID, Model_Name, Model_Type, Recipe_ID) %>% @@ -251,7 +252,7 @@Back Test Best Model per Time Seri
diff --git a/reference/cubist_multistep_predict_impl.html b/reference/cubist_multistep_predict_impl.html index b8a8e2a1..66dbc437 100644 --- a/reference/cubist_multistep_predict_impl.html +++ b/reference/cubist_multistep_predict_impl.html @@ -23,7 +23,7 @@Trained Models
-+@@ -259,7 +260,7 @@trained_model_tbl <- get_trained_models(run_info = run_info) print(trained_model_tbl)Trained Models
Initial Prepped Data
-@@ -94,20 +94,21 @@++R1_prepped_data_tbl <- get_prepped_data(run_info = run_info, recipe = "R1") @@ -273,7 +274,7 @@Initial Prepped Data
Run Info Metadata
-@@ -186,8 +186,9 @@+diff --git a/articles/forecast-components.html b/articles/forecast-components.html index 24aab3d1..0c4312df 100644 --- a/articles/forecast-components.html +++ b/articles/forecast-components.html @@ -46,7 +46,7 @@run_info_tbl <- get_run_info(experiment_name = "finn_forecast") print(run_info_tbl)Prep the Data#> # Target_lag12 <dbl>, Target_lag6_roll3_Avg <dbl>, #> # Target_lag9_roll3_Avg <dbl>, Target_lag12_roll3_Avg <dbl>, #> # Target_lag6_roll6_Avg <dbl>, Target_lag9_roll6_Avg <dbl>, -#> # Target_lag12_roll6_Avg <dbl>, Target_lag6_roll9_Avg <dbl>, … - +#> # Target_lag12_roll6_Avg <dbl>, Target_lag6_roll9_Avg <dbl>, …
diff --git a/news/index.html b/news/index.html index d307a94a..a9d0c4ea 100644 --- a/news/index.html +++ b/news/index.html @@ -23,7 +23,7 @@+R2_prepped_data_tbl <- get_prepped_data(run_info = run_info, recipe = "R2") @@ -218,7 +219,7 @@Train Individual Models
Now that our data is prepared for modeling, let’s now train some models. First we need to create the model workflows, determine our back testing process, and how many hyperparameter combinations to try during the validation process.
Then we can kick off training each model on our data.
-diff --git a/favicon-16x16.png b/favicon-16x16.png index 9e9a6c59..68a4c06a 100644 Binary files a/favicon-16x16.png and b/favicon-16x16.png differ diff --git a/favicon-32x32.png b/favicon-32x32.png index ab2f28b8..366693a0 100644 Binary files a/favicon-32x32.png and b/favicon-32x32.png differ diff --git a/index.html b/index.html index b7265470..296afc3b 100644 --- a/index.html +++ b/index.html @@ -46,7 +46,7 @@+diff --git a/authors.html b/authors.html index 20122bc7..c5f7fa69 100644 --- a/authors.html +++ b/authors.html @@ -23,7 +23,7 @@prep_models(run_info = run_info, models_to_run = c("arima", "ets", "glmnet"), num_hyperparameters = 2) @@ -230,21 +231,21 @@Train Individual ModelsTrain Ensemble Models
After each individual model is trained, we can feed those predictions into ensemble models.
-+ensemble_models(run_info = run_info)diff --git a/articles/tips-for-production.html b/articles/tips-for-production.html index 4110ae1c..b11df4a1 100644 --- a/articles/tips-for-production.html +++ b/articles/tips-for-production.html @@ -46,7 +46,7 @@Final Models
The last step is to create the final simple model averages and select the best models.
-+final_models(run_info = run_info)diff --git a/articles/parallel-processing.html b/articles/parallel-processing.html index e0fa8df0..971aacf2 100644 --- a/articles/parallel-processing.html +++ b/articles/parallel-processing.html @@ -46,7 +46,7 @@Get Forecast Results
Finally we can now retrieve the forecast results from this Finn run.
-diff --git a/articles/models-used-in-finnts.html b/articles/models-used-in-finnts.html index f48ddcbe..7ed33577 100644 --- a/articles/models-used-in-finnts.html +++ b/articles/models-used-in-finnts.html @@ -46,7 +46,7 @@+diff --git a/articles/index.html b/articles/index.html index d407a471..bde1faa7 100644 --- a/articles/index.html +++ b/articles/index.html @@ -23,7 +23,7 @@finn_output_tbl <- get_forecast_data(run_info = run_info) diff --git a/articles/hierarchical-forecasting.html b/articles/hierarchical-forecasting.html index 26322e82..8c0f31ba 100644 --- a/articles/hierarchical-forecasting.html +++ b/articles/hierarchical-forecasting.html @@ -46,7 +46,7 @@Changelog
-finnts 0.4.0.9003 (DEVELOPMENT VERSION)
+finnts 0.4.0.9004 (DEVELOPMENT VERSION)
-Improvements
+Improvements
- Added support for hierarchical forecasting with external regressors
+- Allow global models for hierarchical forecasts
- Multistep horizon forecasts for R1 recipe, listed as
multistep_horizonwithinprep_data()diff --git a/pkgdown.yml b/pkgdown.yml index bc370939..3d396f8d 100644 --- a/pkgdown.yml +++ b/pkgdown.yml @@ -13,7 +13,7 @@ articles: models-used-in-finnts: models-used-in-finnts.html parallel-processing: parallel-processing.html tips-for-production: tips-for-production.html -last_built: 2024-04-29T22:47Z +last_built: 2024-05-30T21:11Z urls: reference: https://microsoft.github.io/finnts/reference article: https://microsoft.github.io/finnts/articles diff --git a/reference/cubist_multistep.html b/reference/cubist_multistep.html index a2afcdc2..91bcf8c1 100644 --- a/reference/cubist_multistep.html +++ b/reference/cubist_multistep.html @@ -23,7 +23,7 @@diff --git a/reference/cubist_multistep_fit_impl.html b/reference/cubist_multistep_fit_impl.html index 21c12161..f3b735bd 100644 --- a/reference/cubist_multistep_fit_impl.html +++ b/reference/cubist_multistep_fit_impl.html @@ -23,7 +23,7 @@Examples
run_info <- set_run_info() #> Finn Submission Info #> • Experiment Name: finn_fcst -#> • Run Name: finn_fcst-20240429T224721Z +#> • Run Name: finn_fcst-20240530T211111Z #> prep_data(run_info, @@ -180,13 +180,13 @@Examples
num_hyperparameters = 2 ) #> ℹ Creating Model Workflows -#> ✔ Creating Model Workflows [178ms] +#> ✔ Creating Model Workflows [174ms] #> #> ℹ Creating Model Hyperparameters -#> ✔ Creating Model Hyperparameters [186ms] +#> ✔ Creating Model Hyperparameters [182ms] #> #> ℹ Creating Train Test Splits -#> ✔ Creating Train Test Splits [284ms] +#> ✔ Creating Train Test Splits [279ms] #> train_models(run_info, @@ -196,17 +196,17 @@Examples
#> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models -#> There were issues with some computations A: x1 +#> There were issues with some computations A: x3 #> → B | warning: A correlation computation is required, but `estimate` is constant and has 0 #> standard deviation, resulting in a divide by 0 error. `NA` will be returned. -#> There were issues with some computations A: x1 +#> There were issues with some computations A: x3 #> There were issues with some computations A: x3 B: x1 #> #> ℹ Training Individual Models #> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models -#> There were issues with some computations A: x2 +#> There were issues with some computations A: x1 #> There were issues with some computations A: x3 #> #> ℹ Training Individual Models @@ -217,14 +217,14 @@Examples
#> There were issues with some computations A: x3 #> #> ℹ Training Individual Models -#> ✔ Training Individual Models [10.2s] +#> ✔ Training Individual Models [10.9s] #> ensemble_models(run_info) #> ℹ Training Ensemble Models #> ℹ Not all time series were completed within 'ensemble_models', expected 1 time series but only 0 time series were ran. Some ran into errors. #> ℹ Training Ensemble Models -#> ✔ Training Ensemble Models [119ms] +#> ✔ Training Ensemble Models [122ms] #> # }Examples
run_info <- set_run_info() #> Finn Submission Info #> • Experiment Name: finn_fcst -#> • Run Name: finn_fcst-20240429T224734Z +#> • Run Name: finn_fcst-20240530T211124Z #> prep_data(run_info, @@ -185,7 +185,7 @@Examples
forecast_horizon = 3 ) #> ℹ Prepping Data -#> ✔ Prepping Data [3.3s] +#> ✔ Prepping Data [3.4s] #> prep_models(run_info, @@ -193,15 +193,15 @@Examples
back_test_scenarios = 3 ) #> ℹ Creating Model Workflows -#> ✔ Creating Model Workflows [120ms] +#> ✔ Creating Model Workflows [142ms] #> #> ℹ Creating Model Hyperparameters -#> ✔ Creating Model Hyperparameters [105ms] +#> ✔ Creating Model Hyperparameters [122ms] #> #> ℹ Creating Train Test Splits #> ℹ Turning ensemble models off since no multivariate models were chosen to run. #> ℹ Creating Train Test Splits -#> ✔ Creating Train Test Splits [261ms] +#> ✔ Creating Train Test Splits [277ms] #> train_models(run_info, @@ -214,67 +214,57 @@Examples
#> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models -#> There were issues with some computations A: x1 #> → B | warning: A correlation computation is required, but `estimate` is constant and has 0 #> standard deviation, resulting in a divide by 0 error. `NA` will be returned. -#> There were issues with some computations A: x1 +#> ℹ Training Individual Models +#> There were issues with some computations A: x3 B: x2 #> There were issues with some computations A: x3 B: x2 #> #> ℹ Training Individual Models #> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models -#> There were issues with some computations A: x1 -#> There were issues with some computations A: x3 -#> -#> ℹ Training Individual Models #> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models -#> There were issues with some computations A: x2 +#> There were issues with some computations A: x1 #> → B | warning: A correlation computation is required, but `estimate` is constant and has 0 #> standard deviation, resulting in a divide by 0 error. `NA` will be returned. -#> There were issues with some computations A: x2 +#> There were issues with some computations A: x1 +#> There were issues with some computations A: x3 B: x2 #> There were issues with some computations A: x3 B: x2 #> #> ℹ Training Individual Models #> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models -#> There were issues with some computations A: x3 -#> There were issues with some computations A: x3 -#> -#> ℹ Training Individual Models #> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models -#> There were issues with some computations A: x2 +#> There were issues with some computations A: x1 #> → B | warning: A correlation computation is required, but `estimate` is constant and has 0 #> standard deviation, resulting in a divide by 0 error. `NA` will be returned. -#> There were issues with some computations A: x2 +#> There were issues with some computations A: x1 +#> There were issues with some computations A: x3 B: x2 #> There were issues with some computations A: x3 B: x2 #> #> ℹ Training Individual Models #> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models -#> There were issues with some computations A: x3 -#> There were issues with some computations A: x3 -#> -#> ℹ Training Individual Models #> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models -#> There were issues with some computations A: x3 +#> There were issues with some computations A: x1 #> There were issues with some computations A: x3 #> #> ℹ Training Individual Models -#> ✔ Training Individual Models [20.3s] +#> ✔ Training Individual Models [21.3s] #> final_models(run_info) #> ℹ Selecting Best Models -#> ✔ Selecting Best Models [452ms] +#> ✔ Selecting Best Models [449ms] #> # }Examples
run_info <- set_run_info() #> Finn Submission Info #> • Experiment Name: finn_fcst -#> • Run Name: finn_fcst-20240429T224759Z +#> • Run Name: finn_fcst-20240530T211150Z #> finn_forecast <- forecast_time_series( @@ -376,10 +376,10 @@Examples
#> ✔ Prepping Data [1.5s] #> #> ℹ Creating Model Workflows -#> ✔ Creating Model Workflows [226ms] +#> ✔ Creating Model Workflows [245ms] #> #> ℹ Creating Model Hyperparameters -#> ✔ Creating Model Hyperparameters [152ms] +#> ✔ Creating Model Hyperparameters [165ms] #> #> ℹ Creating Train Test Splits #> ℹ Turning ensemble models off since no multivariate models were chosen to run. @@ -392,10 +392,14 @@Examples
#> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models +#> There were issues with some computations A: x1 +#> There were issues with some computations A: x3 +#> +#> ℹ Training Individual Models #> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models -#> There were issues with some computations A: x2 +#> There were issues with some computations A: x1 #> There were issues with some computations A: x3 #> There were issues with some computations A: x3 #> @@ -403,15 +407,19 @@Examples
#> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models -#> ✔ Training Individual Models [12.8s] +#> There were issues with some computations A: x3 +#> There were issues with some computations A: x3 +#> +#> ℹ Training Individual Models +#> ✔ Training Individual Models [13s] #> #> ℹ Training Ensemble Models #> ℹ Ensemble models have been turned off. #> ℹ Training Ensemble Models -#> ✔ Training Ensemble Models [17ms] +#> ✔ Training Ensemble Models [19ms] #> #> ℹ Selecting Best Models -#> ✔ Selecting Best Models [238ms] +#> ✔ Selecting Best Models [237ms] #> fcst_tbl <- get_forecast_data(run_info) diff --git a/reference/get_forecast_data.html b/reference/get_forecast_data.html index 626898f7..25031c13 100644 --- a/reference/get_forecast_data.html +++ b/reference/get_forecast_data.html @@ -23,7 +23,7 @@Examples
run_info <- set_run_info() #> Finn Submission Info #> • Experiment Name: finn_fcst -#> • Run Name: finn_fcst-20240429T224818Z +#> • Run Name: finn_fcst-20240530T211210Z #> prep_data(run_info, @@ -146,7 +146,7 @@Examples
recipes_to_run = "R1" ) #> ℹ Prepping Data -#> ✔ Prepping Data [410ms] +#> ✔ Prepping Data [409ms] #> prep_models(run_info, @@ -154,15 +154,15 @@Examples
num_hyperparameters = 1 ) #> ℹ Creating Model Workflows -#> ✔ Creating Model Workflows [78ms] +#> ✔ Creating Model Workflows [87ms] #> #> ℹ Creating Model Hyperparameters -#> ✔ Creating Model Hyperparameters [83ms] +#> ✔ Creating Model Hyperparameters [91ms] #> #> ℹ Creating Train Test Splits #> ℹ Turning ensemble models off since no multivariate models were chosen to run. #> ℹ Creating Train Test Splits -#> ✔ Creating Train Test Splits [354ms] +#> ✔ Creating Train Test Splits [364ms] #> train_models(run_info, @@ -172,9 +172,10 @@Examples
#> → A | warning: A correlation computation is required, but the inputs are size zero or one and #> the standard deviation cannot be computed. `NA` will be returned. #> ℹ Training Individual Models +#> There were issues with some computations A: x1 #> → B | warning: A correlation computation is required, but `estimate` is constant and has 0 #> standard deviation, resulting in a divide by 0 error. `NA` will be returned. -#> ℹ Training Individual Models +#> There were issues with some computations A: x1 #> There were issues with some computations A: x2 B: x1 #> There were issues with some computations A: x3 B: x2 #> @@ -186,18 +187,18 @@Examples
#> → B | warning: A correlation computation is required, but `estimate` is constant and has 0 #> standard deviation, resulting in a divide by 0 error. `NA` will be returned. #> There were issues with some computations A: x1 -#> There were issues with some computations A: x2 B: x6 +#> There were issues with some computations A: x2 B: x5 #> There were issues with some computations A: x3 B: x7 #> #> ℹ Training Individual Models -#> ✔ Training Individual Models [10.1s] +#> ✔ Training Individual Models [11.9s] #> final_models(run_info, average_models = FALSE ) #> ℹ Selecting Best Models -#> ✔ Selecting Best Models [194ms] +#> ✔ Selecting Best Models [192ms] #> fcst_tbl <- get_forecast_data(run_info) diff --git a/reference/get_prepped_data.html b/reference/get_prepped_data.html index 15db5f2d..bf22a1f0 100644 --- a/reference/get_prepped_data.html +++ b/reference/get_prepped_data.html @@ -23,7 +23,7 @@Examples
run_info <- set_run_info() #> Finn Submission Info #> • Experiment Name: finn_fcst -#> • Run Name: finn_fcst-20240429T224830Z +#> • Run Name: finn_fcst-20240530T211223Z #> prep_data(run_info, @@ -150,7 +150,7 @@Examples
recipes_to_run = "R1" ) #> ℹ Prepping Data -#> ✔ Prepping Data [413ms] +#> ✔ Prepping Data [402ms] #> R1_prepped_data_tbl <- get_prepped_data(run_info, diff --git a/reference/get_prepped_models.html b/reference/get_prepped_models.html index ab0c16b3..94742fef 100644 --- a/reference/get_prepped_models.html +++ b/reference/get_prepped_models.html @@ -23,7 +23,7 @@Examples
run_info <- set_run_info() #> Finn Submission Info #> • Experiment Name: finn_fcst -#> • Run Name: finn_fcst-20240429T224831Z +#> • Run Name: finn_fcst-20240530T211224Z #> prep_data(run_info, @@ -142,7 +142,7 @@Examples
recipes_to_run = "R1" ) #> ℹ Prepping Data -#> ✔ Prepping Data [406ms] +#> ✔ Prepping Data [400ms] #> prep_models(run_info, @@ -150,15 +150,15 @@Examples
num_hyperparameters = 1 ) #> ℹ Creating Model Workflows -#> ✔ Creating Model Workflows [81ms] +#> ✔ Creating Model Workflows [82ms] #> #> ℹ Creating Model Hyperparameters -#> ✔ Creating Model Hyperparameters [74ms] +#> ✔ Creating Model Hyperparameters [79ms] #> #> ℹ Creating Train Test Splits #> ℹ Turning ensemble models off since no multivariate models were chosen to run. #> ℹ Creating Train Test Splits -#> ✔ Creating Train Test Splits [350ms] +#> ✔ Creating Train Test Splits [354ms] #> prepped_models_tbl <- get_prepped_models(run_info = run_info) diff --git a/reference/get_run_info.html b/reference/get_run_info.html index 3f8d38ec..95586645 100644 --- a/reference/get_run_info.html +++ b/reference/get_run_info.html @@ -23,7 +23,7 @@Examples
) #> Finn Submission Info #> • Experiment Name: finn_forecast -#> • Run Name: test_run-20240429T224832Z +#> • Run Name: test_run-20240530T211225Z #> run_info_tbl <- get_run_info( diff --git a/reference/get_trained_models.html b/reference/get_trained_models.html index 132c3241..ca4c05e2 100644 --- a/reference/get_trained_models.html +++ b/reference/get_trained_models.html @@ -23,7 +23,7 @@