Added non-autoregresive non-linear results to thesis

This commit is contained in:
2024-05-05 02:17:04 +02:00
parent 75b35bb2c9
commit 177fa1ad86
10 changed files with 59 additions and 59 deletions

View File

@@ -2,9 +2,7 @@ from src.utils.clearml import ClearMLHelper
#### ClearML ####
clearml_helper = ClearMLHelper(project_name="Thesis/NrvForecast")
task = clearml_helper.get_task(
task_name="AQR: GRU (8 - 512) + Load + PV + Wind + NP + QE (dim 5)"
)
task = clearml_helper.get_task(task_name="AQR: Linear + QE (dim 2)")
# task.execute_remotely(queue_name="default", exit_process=True)
from src.policies.PolicyEvaluator import PolicyEvaluator
@@ -29,24 +27,24 @@ data_config = DataConfig()
data_config.NRV_HISTORY = True
data_config.LOAD_HISTORY = True
data_config.LOAD_FORECAST = True
data_config.LOAD_HISTORY = False
data_config.LOAD_FORECAST = False
data_config.WIND_FORECAST = True
data_config.WIND_HISTORY = True
data_config.WIND_FORECAST = False
data_config.WIND_HISTORY = False
data_config.PV_FORECAST = True
data_config.PV_HISTORY = True
data_config.PV_FORECAST = False
data_config.PV_HISTORY = False
data_config.QUARTER = True
data_config.DAY_OF_WEEK = False
data_config.NOMINAL_NET_POSITION = True
data_config.NOMINAL_NET_POSITION = False
data_config = task.connect(data_config, name="data_features")
data_processor = DataProcessor(data_config, path="", lstm=True)
data_processor = DataProcessor(data_config, path="", lstm=False)
data_processor.set_batch_size(512)
data_processor.set_full_day_skip(False)
@@ -72,7 +70,7 @@ model_parameters = {
"hidden_size": 512,
"num_layers": 8,
"dropout": 0.2,
"time_feature_embedding": 5,
"time_feature_embedding": 2,
}
model_parameters = task.connect(model_parameters, name="model_parameters")
@@ -83,13 +81,13 @@ time_embedding = TimeEmbedding(
# time_embedding = TrigonometricTimeEmbedding(data_processor.get_time_feature_size())
lstm_model = GRUModel(
time_embedding.output_dim(inputDim),
len(quantiles),
hidden_size=model_parameters["hidden_size"],
num_layers=model_parameters["num_layers"],
dropout=model_parameters["dropout"],
)
# lstm_model = GRUModel(
# time_embedding.output_dim(inputDim),
# len(quantiles),
# hidden_size=model_parameters["hidden_size"],
# num_layers=model_parameters["num_layers"],
# dropout=model_parameters["dropout"],
# )
# non_linear_model = NonLinearRegression(
# time_embedding.output_dim(inputDim),
@@ -99,9 +97,9 @@ lstm_model = GRUModel(
# 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, lstm_model)
model = nn.Sequential(time_embedding, linear_model)
model.output_size = 1
optimizer = torch.optim.Adam(model.parameters(), lr=model_parameters["learning_rate"])

View File

@@ -2,7 +2,9 @@ from src.utils.clearml import ClearMLHelper
#### ClearML ####
clearml_helper = ClearMLHelper(project_name="Thesis/NAQR: Non-Linear")
task = clearml_helper.get_task(task_name="NAQR: Non-Linear (2 - 256)")
task = clearml_helper.get_task(
task_name="NAQR: Non-Linear (8 - 512) + NRV + LOAD + PV + WIND + NP"
)
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_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")
@@ -64,8 +66,8 @@ else:
model_parameters = {
"learning_rate": 0.0001,
"hidden_size": 256,
"num_layers": 2,
"hidden_size": 512,
"num_layers": 8,
"dropout": 0.2,
}