From e780b46af7a4c2f989af9995375de92241991f64 Mon Sep 17 00:00:00 2001
From: Victor Mylle <victor.mylle@hotmail.com>
Date: Wed, 20 Mar 2024 22:16:19 +0100
Subject: [PATCH] Updated some stuff

---
 Reports/Thesis/verslag.log                    |   2 +-
 Reports/Thesis/verslag.pdf                    | Bin 436330 -> 436330 bytes
 Result-Reports/Policies.md                    |  18 +++++++++++++++++-
 Result-Reports/Profit.md                      |   3 +++
 .../autoregressive_quantiles.py               |  11 -----------
 src/training_scripts/diffusion_training.py    |   1 +
 6 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 Result-Reports/Profit.md

diff --git a/Reports/Thesis/verslag.log b/Reports/Thesis/verslag.log
index deebed7..962a2c1 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)  20 MAR 2024 22:13
+This is pdfTeX, Version 3.141592653-2.6-1.40.25 (TeX Live 2023) (preloaded format=pdflatex 2023.9.17)  20 MAR 2024 22:16
 entering extended mode
  restricted \write18 enabled.
  file:line:error style messages enabled.
diff --git a/Reports/Thesis/verslag.pdf b/Reports/Thesis/verslag.pdf
index e2047099e00cd7d48d9c37f033d147840feabd5c..816cf725cfbb28a4a5569921be6a5c76bf5cba71 100644
GIT binary patch
delta 112
zcmaELLF&~7sfHHD7N!>F7M2#)Eo^)<nam8P3(RCw1k&4$XR=M=bvANxHZXEBb9FT|
lb~SQzF>o<7Fmy9_ax*q|vUGKGF|$*!A*5tG$8xqLMgTn09uNQk

delta 112
zcmaELLF&~7sfHHD7N!>F7M2#)Eo^)<nT$=Q3(RCw1k&4$XR=M=bvCpxcXn~IG<LLb
lad9y*wQ#j`aWprubaHhuHaB*2G`CZ*A*5tG$8xqLMgT`(9zp;B

diff --git a/Result-Reports/Policies.md b/Result-Reports/Policies.md
index dfae14d..1eddedc 100644
--- a/Result-Reports/Policies.md
+++ b/Result-Reports/Policies.md
@@ -198,8 +198,24 @@ Tabellen die we gaan bespreken -> updaten met nieuwe data dan
 !!!!! Fix the test set (maybe save pickle)
 
 Plot profits per year (maybe with charge cycles) for the different models and baselines.
-Spread plotten van difference between charge and discharge thresholds
 
 RESULTATEN FIXEN
 
 Nog eens 3e meeting opbrengen voor 2e deel maart.
+
+Baseline -> thresholds bepalen training data, penalty aanpassen na evaluatie op test
+
+Schaal van plotjes aan zelfde
+
+NRV generaties plotten
+
+Profit during training
+
+
+Beste diffusion and best GRU model -> plotjes van profits during training
+
+
+# !!!! Baseline + Non autoregressive !!!!!!!!!!!!!!!
+
+
+# profit evaluation done day by day. Start with fresh battery. Maybe electritiy bought but not sold -> negative profits? What to do with this? 
\ No newline at end of file
diff --git a/Result-Reports/Profit.md b/Result-Reports/Profit.md
new file mode 100644
index 0000000..8d3fc66
--- /dev/null
+++ b/Result-Reports/Profit.md
@@ -0,0 +1,3 @@
+| Experiment | Model Type | Input Parameters | Profit | Charge Cycles |
+|------------|------------|------------------|--------|----------------|
+| [Link](https://clearml.victormylle.be/projects/2e46d4af6f1e4c399cf9f5aa30bc8795/experiments/432396923e354d579494048656228c32/info-output/metrics/scalar) | Diffusion Model | 
\ No newline at end of file
diff --git a/src/training_scripts/autoregressive_quantiles.py b/src/training_scripts/autoregressive_quantiles.py
index 1ea553c..86ed0e7 100644
--- a/src/training_scripts/autoregressive_quantiles.py
+++ b/src/training_scripts/autoregressive_quantiles.py
@@ -114,17 +114,6 @@ trainer = AutoRegressiveQuantileTrainer(
     debug=False,
 )
 
-# trainer = NonAutoRegressiveQuantileRegression(
-#     model,
-#     inputDim,
-#     optimizer,
-#     data_processor,
-#     quantiles,
-#     "cuda",
-#     policy_evaluator=policy_evaluator,
-#     debug=False,
-# )
-
 trainer.add_metrics_to_track(
     [PinballLoss(quantiles), MSELoss(), L1Loss(), CRPSLoss(quantiles)]
 )
diff --git a/src/training_scripts/diffusion_training.py b/src/training_scripts/diffusion_training.py
index e48b511..456fee8 100644
--- a/src/training_scripts/diffusion_training.py
+++ b/src/training_scripts/diffusion_training.py
@@ -18,6 +18,7 @@ from src.policies.PolicyEvaluator import PolicyEvaluator
 #### Data Processor ####
 data_config = DataConfig()
 data_config.NRV_HISTORY = True
+
 data_config.LOAD_HISTORY = False
 data_config.LOAD_FORECAST = False