diff --git a/Reports/Thesis/sections/results/models/diffusion.tex b/Reports/Thesis/sections/results/models/diffusion.tex index 1b09b53..baa5d16 100644 --- a/Reports/Thesis/sections/results/models/diffusion.tex +++ b/Reports/Thesis/sections/results/models/diffusion.tex @@ -51,12 +51,16 @@ In Figure \ref{fig:diffusion_intermediates}, multiple intermediate steps of the & 300 & 2 & 256 & 57129.71 & 185.56 & 81.00 \\ & 300 & 2 & 512 & 48364.77 & 169.39 & 79.13 \\ & 300 & 2 & 1024 & 43540.50 & 159.17 & 78.27 \\ + & 300 & 2 & 2048 & 41946.52 & 155.85 & 78.19 \\ & 300 & 3 & 256 & 52741.73 & 177.09 & 79.55 \\ & 300 & 3 & 512 & 45048.05 & 161.89 & 78.46 \\ & 300 & 3 & 1024 & 42089.13 & 155.97 & 78.25 \\ + & 300 & 3 & 2048 & 41797.63 & 154.69 & 78.05 \\ + & 300 & 3 & 4096 & 39943.93 & 151.62 & 77.59 \\ & 300 & 4 & 256 & 56939.68 & 185.07 & 81.16 \\ & 300 & 4 & 512 & 46225.72 & 164.74 & 79.19 \\ & 300 & 4 & 1024 & 42984.02 & 157.54 & 77.92 \\ + & 300 & 4 & 2048 & 41145.32 & 154.14 & 78.18 \\ \midrule NRV + Load + Wind + PV + NP & & & & & & & \\ & 300 & 2 & 256 & 63337.36 & 196.21 & 84.29 \\ diff --git a/Reports/Thesis/verslag.log b/Reports/Thesis/verslag.log index 7ff3b5c..39da091 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) 10 MAY 2024 15:51 +This is pdfTeX, Version 3.141592653-2.6-1.40.25 (TeX Live 2023) (preloaded format=pdflatex 2023.9.17) 11 MAY 2024 02:04 entering extended mode restricted \write18 enabled. file:line:error style messages enabled. @@ -1728,7 +1728,10 @@ Package pdftex.def Info: images/diffusion/results/intermediates/Testing Intermed LaTeX Warning: `h' float specifier changed to `ht'. -[37] [38 <./images/diffusion/results/intermediates/Testing Intermediates 864_Sample intermediate 1_00000000.jpeg> <./images/diffusion/results/intermediates/Testing Intermediates 864_Sample intermediate 2_00000000.jpeg> <./images/diffusion/results/intermediates/Testing Intermediates 864_Sample intermediate 3_00000000.jpeg> <./images/diffusion/results/intermediates/Testing Intermediates 864_Sample intermediate 4_00000000.jpeg>]) (./sections/results/models/comparison.tex [39] [40] +[37] +Overfull \vbox (38.77904pt too high) has occurred while \output is active [] + + [38 <./images/diffusion/results/intermediates/Testing Intermediates 864_Sample intermediate 1_00000000.jpeg> <./images/diffusion/results/intermediates/Testing Intermediates 864_Sample intermediate 2_00000000.jpeg> <./images/diffusion/results/intermediates/Testing Intermediates 864_Sample intermediate 3_00000000.jpeg> <./images/diffusion/results/intermediates/Testing Intermediates 864_Sample intermediate 4_00000000.jpeg>]) (./sections/results/models/comparison.tex [39] [40] File: images/quantile_regression/aqr_linear_model_samples/AQR_NRV_Load_Wind_PV_NP_QE-Sample_864.png Graphic file (type png) Package pdftex.def Info: images/quantile_regression/aqr_linear_model_samples/AQR_NRV_Load_Wind_PV_NP_QE-Sample_864.png used on input line 46. @@ -1792,7 +1795,7 @@ Here is how much of TeX's memory you used: 1141 hyphenation exceptions out of 8191 84i,16n,131p,2100b,5180s stack positions out of 10000i,1000n,20000p,200000b,200000s -Output written on verslag.pdf (46 pages, 8233151 bytes). +Output written on verslag.pdf (46 pages, 8233219 bytes). PDF statistics: 632 PDF objects out of 1000 (max. 8388607) 468 compressed objects within 5 object streams diff --git a/Reports/Thesis/verslag.pdf b/Reports/Thesis/verslag.pdf index 3213100..5aa96e3 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 index 567c82a..84eb81a 100644 Binary files a/Reports/Thesis/verslag.synctex.gz 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 31d8f33..ccb48df 100644 --- a/src/training_scripts/autoregressive_quantiles.py +++ b/src/training_scripts/autoregressive_quantiles.py @@ -2,7 +2,7 @@ from src.utils.clearml import ClearMLHelper #### ClearML #### clearml_helper = ClearMLHelper(project_name="Thesis/NrvForecast") -task = clearml_helper.get_task(task_name="AQR: Linear + Load + Wind + PV + QE + NP") +task = clearml_helper.get_task(task_name="AQR: Non Linear + Load + Wind + PV + QE + NP") task.execute_remotely(queue_name="default", exit_process=True) from src.policies.PolicyEvaluator import PolicyEvaluator @@ -68,9 +68,9 @@ else: model_parameters = { "learning_rate": 0.0001, "hidden_size": 256, - "num_layers": 16, + "num_layers": 8, "dropout": 0.2, - "time_feature_embedding": 2, + "time_feature_embedding": 5, } model_parameters = task.connect(model_parameters, name="model_parameters") @@ -89,17 +89,17 @@ time_embedding = TimeEmbedding( # dropout=model_parameters["dropout"], # ) -# non_linear_model = NonLinearRegression( -# time_embedding.output_dim(inputDim), -# len(quantiles), -# hiddenSize=model_parameters["hidden_size"], -# numLayers=model_parameters["num_layers"], -# dropout=model_parameters["dropout"], -# ) +non_linear_model = NonLinearRegression( + time_embedding.output_dim(inputDim), + len(quantiles), + hiddenSize=model_parameters["hidden_size"], + numLayers=model_parameters["num_layers"], + dropout=model_parameters["dropout"], +) -linear_model = LinearRegression(time_embedding.output_dim(inputDim), len(quantiles)) +# linear_model = LinearRegression(time_embedding.output_dim(inputDim), len(quantiles)) -model = nn.Sequential(time_embedding, linear_model) +model = nn.Sequential(time_embedding, non_linear_model) model.output_size = 1 optimizer = torch.optim.Adam(model.parameters(), lr=model_parameters["learning_rate"]) diff --git a/src/training_scripts/diffusion_training.py b/src/training_scripts/diffusion_training.py index 8fa816b..4c1d483 100644 --- a/src/training_scripts/diffusion_training.py +++ b/src/training_scripts/diffusion_training.py @@ -2,7 +2,7 @@ from src.utils.clearml import ClearMLHelper clearml_helper = ClearMLHelper(project_name="Thesis/NrvForecast") task = clearml_helper.get_task( - task_name="Diffusion Training: hidden_sizes=[2048, 2048, 2048, 2048] (300 steps), lr=0.0001, time_dim=8" + task_name="Diffusion Training: hidden_sizes=[2048, 2048, 2048] (300 steps), lr=0.0001, time_dim=8" ) task.execute_remotely(queue_name="default", exit_process=True) @@ -42,7 +42,7 @@ print("Input dim: ", inputDim) model_parameters = { "epochs": 15000, "learning_rate": 0.0001, - "hidden_sizes": [2048, 2048, 2048, 2048], + "hidden_sizes": [2048, 2048, 2048], "time_dim": 8, }