diff --git a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_13344_samples.png b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_13344_samples.png index bd04a3c..3d535e3 100644 Binary files a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_13344_samples.png and b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_13344_samples.png differ diff --git a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_4320_samples.png b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_4320_samples.png index 7bfcb75..71b4ee3 100644 Binary files a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_4320_samples.png and b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_4320_samples.png differ diff --git a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_6336_samples.png b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_6336_samples.png index f755077..1ec00d8 100644 Binary files a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_6336_samples.png and b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_6336_samples.png differ diff --git a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_7008_samples.png b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_7008_samples.png index 8c725b9..1a70bc9 100644 Binary files a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_7008_samples.png and b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_7008_samples.png differ diff --git a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png index f9c83e9..bb8bb39 100644 Binary files a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png and b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png differ diff --git a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_13344.png b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_13344.png index 6a81a42..b510152 100644 Binary files a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_13344.png and b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_13344.png differ diff --git a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_4320.png b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_4320.png index 77a67df..c23825d 100644 Binary files a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_4320.png and b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_4320.png differ diff --git a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_6336.png b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_6336.png index 36545f2..be0b784 100644 Binary files a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_6336.png and b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_6336.png differ diff --git a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_7008.png b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_7008.png index b7ba2b4..ecbd709 100644 Binary files a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_7008.png and b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_7008.png differ diff --git a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_864.png b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_864.png index 585fbbf..e289753 100644 Binary files a/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_864.png and b/Reports/Thesis/images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_864.png differ diff --git a/Reports/Thesis/sections/nrv_prediction.tex b/Reports/Thesis/sections/nrv_prediction.tex index 93b600b..16b9e77 100644 --- a/Reports/Thesis/sections/nrv_prediction.tex +++ b/Reports/Thesis/sections/nrv_prediction.tex @@ -322,19 +322,17 @@ Because of error propagation in the autoregressive model, the outputted quantile % figure with 2 models compared (left with 4 row examples and right with 4 row examples), autoregressive vs non-autoregressive \begin{figure}[ht] \centering - \begin{adjustbox}{width=1.3\textwidth,center} - \begin{subfigure}[b]{0.7\textwidth} - \includegraphics[width=\textwidth]{images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png} - \caption{Autoregressive model} - \label{fig:linear_model_sample_comparison_autoregressive} - \end{subfigure} - \hfill - \begin{subfigure}[b]{0.7\textwidth} - \includegraphics[width=\textwidth]{images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png} - \caption{Non-autoregressive model} - \label{fig:linear_model_sample_comparison_non_autoregressive} - \end{subfigure} - \end{adjustbox} + \begin{subfigure}[b]{0.49\textwidth} + \includegraphics[width=\textwidth]{images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png} + \caption{Autoregressive model} + \label{fig:linear_model_sample_comparison_autoregressive} + \end{subfigure} + \hfill + \begin{subfigure}[b]{0.49\textwidth} + \includegraphics[width=\textwidth]{images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png} + \caption{Non-autoregressive model} + \label{fig:linear_model_sample_comparison_non_autoregressive} + \end{subfigure} \caption{Comparison of the autoregressive and non-autoregressive linear models. The plots show the confidence intervals calculated from 1000 generated full-day NRV samples. The samples were generated using input features NRV, Load, Wind, PV, Net Position and the quarter embedding.} \label{fig:linear_model_sample_comparison} \end{figure} diff --git a/Reports/Thesis/verslag.log b/Reports/Thesis/verslag.log index 10df420..e44bbdb 100644 --- a/Reports/Thesis/verslag.log +++ b/Reports/Thesis/verslag.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.141592653-2.6-1.40.25 (TeX Live 2023) (preloaded format=pdflatex 2023.9.17) 19 APR 2024 15:58 +This is pdfTeX, Version 3.141592653-2.6-1.40.25 (TeX Live 2023) (preloaded format=pdflatex 2023.9.17) 19 APR 2024 16:14 entering extended mode restricted \write18 enabled. file:line:error style messages enabled. @@ -1412,37 +1412,37 @@ Underfull \hbox (badness 10000) in paragraph at lines 259--265 [] [19 <./images/quantile_regression/aqr_linear_model_samples/AQR_NRV_Load_Wind_PV_NP_QE-Sample_864.png> <./images/quantile_regression/aqr_linear_model_samples/AQR_NRV_Load_Wind_PV_NP_QE-Sample_4320.png> <./images/quantile_regression/aqr_linear_model_samples/AQR_NRV_Load_Wind_PV_NP_QE-Sample_6336.png> <./images/quantile_regression/aqr_linear_model_samples/AQR_NRV_Load_Wind_PV_NP_QE-Sample_7008.png>] - + File: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_864.png Graphic file (type png) Package pdftex.def Info: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_864.png used on input line 291. -(pdftex.def) Requested size: 223.07211pt x 111.53212pt. - +(pdftex.def) Requested size: 223.07211pt x 112.49284pt. + File: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_4320.png Graphic file (type png) Package pdftex.def Info: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_4320.png used on input line 297. -(pdftex.def) Requested size: 223.07211pt x 111.53212pt. - +(pdftex.def) Requested size: 223.07211pt x 112.49284pt. + File: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_6336.png Graphic file (type png) Package pdftex.def Info: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_6336.png used on input line 303. -(pdftex.def) Requested size: 223.07211pt x 111.53212pt. - +(pdftex.def) Requested size: 223.07211pt x 112.49284pt. + File: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_7008.png Graphic file (type png) Package pdftex.def Info: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Sample_7008.png used on input line 309. -(pdftex.def) Requested size: 223.07211pt x 111.53212pt. - +(pdftex.def) Requested size: 223.07211pt x 112.49284pt. + File: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png Graphic file (type png) -Package pdftex.def Info: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png used on input line 327. -(pdftex.def) Requested size: 318.66948pt x 159.33633pt. +Package pdftex.def Info: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png used on input line 326. +(pdftex.def) Requested size: 223.07211pt x 112.49284pt. File: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png Graphic file (type png) -Package pdftex.def Info: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png used on input line 333. -(pdftex.def) Requested size: 318.66948pt x 159.33633pt. +Package pdftex.def Info: images/quantile_regression/naqr_linear_model_samples/NAQR_NRV_Load_Wind_PV_NP-Example_864_samples.png used on input line 332. +(pdftex.def) Requested size: 223.07211pt x 112.49284pt. -Underfull \hbox (badness 10000) in paragraph at lines 318--341 +Underfull \hbox (badness 10000) in paragraph at lines 318--339 [] @@ -1462,15 +1462,15 @@ Package logreq Info: Writing requests to 'verslag.run.xml'. ) Here is how much of TeX's memory you used: - 26661 strings out of 476025 - 480670 string characters out of 5790017 + 26660 strings out of 476025 + 480658 string characters out of 5790017 1866388 words of memory out of 5000000 - 46623 multiletter control sequences out of 15000+600000 + 46622 multiletter control sequences out of 15000+600000 597808 words of font info for 86 fonts, out of 8000000 for 9000 1141 hyphenation exceptions out of 8191 83i,16n,131p,1343b,5180s stack positions out of 10000i,1000n,20000p,200000b,200000s -Output written on verslag.pdf (23 pages, 3008032 bytes). +Output written on verslag.pdf (23 pages, 2947472 bytes). PDF statistics: 346 PDF objects out of 1000 (max. 8388607) 270 compressed objects within 3 object streams diff --git a/Reports/Thesis/verslag.pdf b/Reports/Thesis/verslag.pdf index ccfe950..e95e9d6 100644 Binary files a/Reports/Thesis/verslag.pdf and b/Reports/Thesis/verslag.pdf differ diff --git a/Reports/Thesis/verslag.synctex.gz b/Reports/Thesis/verslag.synctex.gz new file mode 100644 index 0000000..86f73ee Binary files /dev/null and b/Reports/Thesis/verslag.synctex.gz differ diff --git a/src/training_scripts/autoregressive_quantiles.py b/src/training_scripts/autoregressive_quantiles.py index 6876b4a..86f47cc 100644 --- a/src/training_scripts/autoregressive_quantiles.py +++ b/src/training_scripts/autoregressive_quantiles.py @@ -3,7 +3,7 @@ from src.utils.clearml import ClearMLHelper #### ClearML #### clearml_helper = ClearMLHelper(project_name="Thesis/NrvForecast") task = clearml_helper.get_task( - task_name="AQR: Linear Baseline + Load + PV + Wind + Net Position + Quarter" + task_name="AQR: Linear Baseline + Load + PV + Wind + Net Position + Quarter (dim 5)" ) task.execute_remotely(queue_name="default", exit_process=True) diff --git a/src/training_scripts/non_autoregressive_quantiles.py b/src/training_scripts/non_autoregressive_quantiles.py index 0ada3ec..703146b 100644 --- a/src/training_scripts/non_autoregressive_quantiles.py +++ b/src/training_scripts/non_autoregressive_quantiles.py @@ -2,7 +2,9 @@ from src.utils.clearml import ClearMLHelper #### ClearML #### clearml_helper = ClearMLHelper(project_name="Thesis/NAQR: Linear") -task = clearml_helper.get_task(task_name="NAQR: Linear (extra test)") +task = clearml_helper.get_task( + task_name="NAQR: Linear + Load + PV + Wind + Net Position" +) task.execute_remotely(queue_name="default", exit_process=True) from src.policies.PolicyEvaluator import PolicyEvaluator @@ -27,16 +29,16 @@ from src.models.time_embedding_layer import TimeEmbedding data_config = DataConfig() data_config.NRV_HISTORY = True -data_config.LOAD_HISTORY = False -data_config.LOAD_FORECAST = False +data_config.LOAD_HISTORY = True +data_config.LOAD_FORECAST = True -data_config.WIND_FORECAST = False -data_config.WIND_HISTORY = False +data_config.WIND_FORECAST = True +data_config.WIND_HISTORY = True -data_config.PV_FORECAST = False -data_config.PV_HISTORY = False +data_config.PV_FORECAST = True +data_config.PV_HISTORY = True -data_config.NOMINAL_NET_POSITION = False +data_config.NOMINAL_NET_POSITION = True data_config = task.connect(data_config, name="data_features")