Skip to content

Commit d042c70

Browse files
committed
Implement final eval
1 parent edc106e commit d042c70

File tree

10 files changed

+146040
-107766
lines changed

10 files changed

+146040
-107766
lines changed

diploma_thesis/agents/utils/rl/dqn.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from typing import Dict
22

33
import tensordict
4+
import torch
45
from torch.optim.swa_utils import AveragedModel, get_ema_avg_fn
56

67
from agents.utils.memory import NotReadyException
@@ -52,7 +53,9 @@ def compute_loss():
5253

5354
print(actions.view(-1), q_values.view(-1))
5455

55-
loss_ = self.loss(actions, q_values)
56+
weight = torch.tensor(info['_weight']) if '_weight' in info.keys() else torch.ones_like(q_values)
57+
58+
loss_ = (self.loss(actions, q_values) * weight).mean()
5659
td_error_ = torch.square(actions - q_values)
5760

5861
entropy = torch.distributions.Categorical(logits=actions).entropy().mean()

diploma_thesis/b.txt

-107,762
Large diffs are not rendered by default.

diploma_thesis/c.txt

+146,021
Large diffs are not rendered by default.

diploma_thesis/configuration/experiments/jsp/GRAPH-NN/experiments/1/0/experiment.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dqn_1: &dqn_1
1313
- 'configuration/mods/machine/mods'
1414
mods:
1515
- 'agent/dqn/ddqn.yml'
16-
# - 'agent/dqn/prioritized.yml'
16+
- 'agent/dqn/prioritized.yml'
1717
- *default_mods
1818

1919

@@ -26,7 +26,7 @@ dqn_1_local: &dqn_1_local
2626
- 'configuration/mods/machine/mods'
2727
mods:
2828
- 'agent/dqn/ddqn.yml'
29-
# - 'agent/dqn/prioritized.yml'
29+
- 'agent/dqn/prioritized.yml'
3030
- *default_mods
3131

3232
###############################################################################################

diploma_thesis/configuration/experiments/jsp/GRAPH-NN/experiments/1/1/experiment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dqn_1: &dqn_1
3030
- 'configuration/mods/machine/mods'
3131
mods:
3232
- 'agent/dqn/ddqn.yml'
33-
# - 'agent/dqn/prioritized.yml'
33+
- 'agent/dqn/prioritized.yml'
3434
- *default_mods
3535

3636
###############################################################################################

diploma_thesis/configuration/experiments/jsp/GRAPH-NN/experiments/1/2/experiment.yml

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ dqn_1: &dqn_1
3131
- 'configuration/mods/machine/mods'
3232
mods:
3333
- 'agent/dqn/ddqn.yml'
34+
- 'agent/dqn/prioritized.yml'
3435
- *default_mods
3536

3637
###############################################################################################
@@ -42,6 +43,7 @@ dqn_1_hierarchical: &dqn_1_hierarchical
4243
- 'configuration/mods/machine/mods'
4344
mods:
4445
- 'agent/dqn/ddqn.yml'
46+
- 'agent/dqn/prioritized.yml'
4547
- *default_mods
4648

4749
###############################################################################################

diploma_thesis/configuration/experiments/jsp/GRAPH-NN/experiments/1/3/experiment.yml

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ dqn_1: &dqn_1
2929
- 'configuration/mods/machine/mods'
3030
mods:
3131
- 'agent/dqn/ddqn.yml'
32+
- 'agent/dqn/prioritized.yml'
3233
- *default_mods
3334

3435
###############################################################################################
@@ -40,6 +41,7 @@ dqn_1_gat: &dqn_1_gat
4041
- 'configuration/mods/machine/mods'
4142
mods:
4243
- 'agent/dqn/ddqn.yml'
44+
- 'agent/dqn/prioritized.yml'
4345
- *default_mods
4446

4547
###############################################################################################
@@ -51,6 +53,7 @@ dqn_1_gcn: &dqn_1_gcn
5153
- 'configuration/mods/machine/mods'
5254
mods:
5355
- 'agent/dqn/ddqn.yml'
56+
- 'agent/dqn/prioritized.yml'
5457
- *default_mods
5558

5659

@@ -63,6 +66,7 @@ dqn_1_sage: &dqn_1_sage
6366
- 'configuration/mods/machine/mods'
6467
mods:
6568
- 'agent/dqn/ddqn.yml'
69+
- 'agent/dqn/prioritized.yml'
6670
- *default_mods
6771

6872

diploma_thesis/configuration/experiments/jsp/GRAPH-NN/experiments/1/flexible_machine.yml

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ parameters:
6060

6161
loss:
6262
kind: 'mse'
63+
parameters:
64+
reduction: 'none'
6365

6466
optimizer:
6567
model:

diploma_thesis/configuration/experiments/jsp/GRAPH-NN/experiments/3/machine.yml

+2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ parameters:
6363

6464
loss:
6565
kind: 'mse'
66+
parameters:
67+
reduction: 'none'
6668

6769
optimizer:
6870
model:

diploma_thesis/configuration/experiments/jsp/MARL-DQN/experiment/0/machine.yml

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ parameters:
6262

6363
loss:
6464
kind: 'huber'
65+
parameters:
66+
reduction: 'none'
6567

6668
optimizer:
6769
model:

0 commit comments

Comments
 (0)