mirror of
https://github.com/wassname/DeepRL.git
synced 2026-09-11 11:53:01 +08:00
Fix a bug of Categorical DQN
This commit is contained in:
@@ -38,7 +38,9 @@ class CategoricalDQNAgent:
|
|||||||
steps = 0
|
steps = 0
|
||||||
while True:
|
while True:
|
||||||
value = self.learning_network.predict(np.stack([self.task.normalize_state(state)])).squeeze(0).data
|
value = self.learning_network.predict(np.stack([self.task.normalize_state(state)])).squeeze(0).data
|
||||||
value = torch.mm(value, self.atoms.unsqueeze(1)).cpu().numpy().flatten()
|
# self.config.logger.histo_summary('prob', value, self.total_steps)
|
||||||
|
value = (value * self.atoms).sum(-1).cpu().numpy().flatten()
|
||||||
|
# self.config.logger.histo_summary('q', value, self.total_steps)
|
||||||
if deterministic:
|
if deterministic:
|
||||||
action = np.argmax(value)
|
action = np.argmax(value)
|
||||||
elif self.total_steps < self.config.exploration_steps:
|
elif self.total_steps < self.config.exploration_steps:
|
||||||
@@ -46,7 +48,7 @@ class CategoricalDQNAgent:
|
|||||||
else:
|
else:
|
||||||
action = self.policy.sample(value)
|
action = self.policy.sample(value)
|
||||||
next_state, reward, done, _ = self.task.step(action)
|
next_state, reward, done, _ = self.task.step(action)
|
||||||
total_reward += np.sum(reward * self.config.reward_weight)
|
total_reward += reward
|
||||||
reward = self.config.reward_shift_fn(reward)
|
reward = self.config.reward_shift_fn(reward)
|
||||||
if not deterministic:
|
if not deterministic:
|
||||||
self.replay.feed([state, action, reward, next_state, int(done)])
|
self.replay.feed([state, action, reward, next_state, int(done)])
|
||||||
@@ -62,18 +64,21 @@ class CategoricalDQNAgent:
|
|||||||
next_states = self.task.normalize_state(next_states)
|
next_states = self.task.normalize_state(next_states)
|
||||||
prob_next = self.target_network.predict(next_states).data
|
prob_next = self.target_network.predict(next_states).data
|
||||||
q_next = (prob_next * self.atoms).sum(-1)
|
q_next = (prob_next * self.atoms).sum(-1)
|
||||||
|
# self.config.logger.histo_summary('q next', q_next.cpu().numpy(), self.total_steps)
|
||||||
_, a_next = torch.max(q_next, dim=1)
|
_, a_next = torch.max(q_next, dim=1)
|
||||||
a_next = a_next.view(-1, 1, 1).expand(-1, -1, prob_next.size(2))
|
a_next = a_next.view(-1, 1, 1).expand(-1, -1, prob_next.size(2))
|
||||||
prob_next = prob_next.gather(1, a_next).squeeze(1)
|
prob_next = prob_next.gather(1, a_next).squeeze(1)
|
||||||
|
# self.config.logger.histo_summary('prob next', prob_next.cpu().numpy(), self.total_steps)
|
||||||
|
|
||||||
rewards = self.learning_network.tensor(rewards)
|
rewards = self.learning_network.tensor(rewards)
|
||||||
atoms_next = rewards.view(-1, 1) + self.config.discount * self.atoms.view(1, -1)
|
terminals = self.learning_network.tensor(terminals)
|
||||||
epsilon = 1e-5
|
atoms_next = rewards.view(-1, 1) + self.config.discount * (1 - terminals.view(-1, 1)) * self.atoms.view(1, -1)
|
||||||
atoms_next.clamp_(self.config.categorical_v_min + epsilon, self.config.categorical_v_max - epsilon)
|
# epsilon = 1e-5
|
||||||
|
atoms_next.clamp_(self.config.categorical_v_min, self.config.categorical_v_max)
|
||||||
b = (atoms_next - self.config.categorical_v_min) / self.delta_atom
|
b = (atoms_next - self.config.categorical_v_min) / self.delta_atom
|
||||||
l = b.floor()
|
l = b.floor()
|
||||||
u = b.ceil()
|
u = b.ceil()
|
||||||
d_m_l = (u - b) * prob_next
|
d_m_l = (u + (l == u).float() - b) * prob_next
|
||||||
d_m_u = (b - l) * prob_next
|
d_m_u = (b - l) * prob_next
|
||||||
target_prob = self.learning_network.tensor(np.zeros(prob_next.size()))
|
target_prob = self.learning_network.tensor(np.zeros(prob_next.size()))
|
||||||
for i in range(target_prob.size(0)):
|
for i in range(target_prob.size(0)):
|
||||||
@@ -85,6 +90,7 @@ class CategoricalDQNAgent:
|
|||||||
actions = actions.view(-1, 1, 1).expand(-1, -1, prob.size(2))
|
actions = actions.view(-1, 1, 1).expand(-1, -1, prob.size(2))
|
||||||
prob = prob.gather(1, Variable(actions)).squeeze(1)
|
prob = prob.gather(1, Variable(actions)).squeeze(1)
|
||||||
loss = -(Variable(target_prob) * prob.log()).sum(-1).mean()
|
loss = -(Variable(target_prob) * prob.log()).sum(-1).mean()
|
||||||
|
# self.config.logger.scalar_summary('loss', loss.data.cpu().numpy().flatten(), self.total_steps)
|
||||||
self.optimizer.zero_grad()
|
self.optimizer.zero_grad()
|
||||||
loss.backward()
|
loss.backward()
|
||||||
self.optimizer.step()
|
self.optimizer.step()
|
||||||
|
|||||||
+1
-1
@@ -40,7 +40,7 @@ class DQNAgent:
|
|||||||
else:
|
else:
|
||||||
action = self.policy.sample(value)
|
action = self.policy.sample(value)
|
||||||
next_state, reward, done, _ = self.task.step(action)
|
next_state, reward, done, _ = self.task.step(action)
|
||||||
total_reward += np.sum(reward * self.config.reward_weight)
|
total_reward += reward
|
||||||
reward = self.config.reward_shift_fn(reward)
|
reward = self.config.reward_shift_fn(reward)
|
||||||
if not deterministic:
|
if not deterministic:
|
||||||
self.replay.feed([state, action, reward, next_state, int(done)])
|
self.replay.feed([state, action, reward, next_state, int(done)])
|
||||||
|
|||||||
@@ -345,13 +345,14 @@ def categorical_dqn_cart_pole():
|
|||||||
config.replay_fn = lambda: Replay(memory_size=10000, batch_size=10)
|
config.replay_fn = lambda: Replay(memory_size=10000, batch_size=10)
|
||||||
config.discount = 0.99
|
config.discount = 0.99
|
||||||
config.target_network_update_freq = 200
|
config.target_network_update_freq = 200
|
||||||
config.exploration_steps = 0
|
config.exploration_steps = 100
|
||||||
config.logger = Logger('./log', logger)
|
config.logger = Logger('./log', logger, skip=True)
|
||||||
|
# config.logger = Logger('./log', logger)
|
||||||
config.test_interval = 100
|
config.test_interval = 100
|
||||||
config.test_repetitions = 50
|
config.test_repetitions = 50
|
||||||
config.categorical_v_max = 200
|
config.categorical_v_max = 100
|
||||||
config.categorical_v_min = -config.categorical_v_min
|
config.categorical_v_min = -100
|
||||||
config.categorical_n_atoms = 10
|
config.categorical_n_atoms = 50
|
||||||
run_episodes(CategoricalDQNAgent(config))
|
run_episodes(CategoricalDQNAgent(config))
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|||||||
@@ -99,5 +99,5 @@ class CategoricalNet(BasicNet):
|
|||||||
pre_prob = self.fc_categorical(phi).view((-1, self.n_actions, self.n_atoms))
|
pre_prob = self.fc_categorical(phi).view((-1, self.n_actions, self.n_atoms))
|
||||||
prob = F.softmax(pre_prob, dim=-1)
|
prob = F.softmax(pre_prob, dim=-1)
|
||||||
if to_numpy:
|
if to_numpy:
|
||||||
return pre_prob.cpu().data.numpy()
|
return prob.cpu().data.numpy()
|
||||||
return prob
|
return prob
|
||||||
|
|||||||
Reference in New Issue
Block a user