Skip to content

Commit dbc7137

Browse files
committed
polish(pu): reformat zoo/crowd_sim/
1 parent 745f0a8 commit dbc7137

23 files changed

+26
-32
lines changed

zoo/CrowdSim/envs/Crowdsim/__init__.py

-7
This file was deleted.

zoo/CrowdSim/envs/Crowdsim/env/model/__init__.py

Whitespace-only changes.

zoo/CrowdSim/envs/__init__.py

Whitespace-only changes.
File renamed without changes.
File renamed without changes.

zoo/CrowdSim/config/crowdsim_muzero_md_config.py zoo/crowd_sim/config/crowdsim_muzero_md_config.py

-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
),
6868
cuda=True,
6969
env_type='not_board_games',
70-
# game_segment_length=120,
7170
game_segment_length=200,
7271
update_per_collect=update_per_collect,
7372
batch_size=batch_size,

zoo/CrowdSim/config/crowdsim_muzero_rgcn_config.py zoo/crowd_sim/config/crowdsim_muzero_rgcn_config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
robot_num=robot_num,
4949
human_num=human_num,
5050
action_space_size=(len(one_uav_action_space)) ** robot_num,
51-
model_type='rgcn',
51+
model_type='rgcn', #
5252
lstm_hidden_size=256,
5353
latent_state_dim=256,
5454
self_supervised_learning_loss=True, # NOTE: default is False.

zoo/CrowdSim/entry/eval_crowdsim.py zoo/crowd_sim/entry/eval_crowdsim.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# # 导入模块中的内容
2525
# from formatted_total_config import main_config, create_config
2626
# from result.new_env.new_CrowdSim_vt20_muzero_md_ssl_step300000_uav2__human59_seed0.formatted_total_config import main_config, create_config
27-
from zoo.CrowdSim.config.crowdsim_muzero_md_config import main_config, create_config
27+
from zoo.crowd_sim.config.crowdsim_muzero_md_config import main_config, create_config
2828

2929
# model_path is the path to the trained MuZero model checkpoint.
3030
# If no path is provided, the script will use the default model.

zoo/CrowdSim/envs/Crowdsim/env/model/agent.py zoo/crowd_sim/envs/CrowdSim/agent.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import abc
22
import random
33
import logging
4-
from zoo.CrowdSim.envs.Crowdsim.env.model.mdp import *
4+
from zoo.crowd_sim.envs.CrowdSim.mdp import *
55

66

77
class Agent():
@@ -190,5 +190,4 @@ def total_blocks(self):
190190
# info_queue.update(arrivals=5, departures=0) # 5 blocks enter the queue, all with aoi of 0
191191
# info_queue.update(arrivals=3, departures=2) # 3 new blocks enter, 2 blocks leave
192192
# total_age = info_queue.total_aoi() # Calculate the total age of information in the queue
193-
194-
# total_age
193+
# print(total_age)

zoo/CrowdSim/envs/Crowdsim/env/crowd_sim.py zoo/crowd_sim/envs/CrowdSim/crowd_sim.py

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
import logging
44
import random
55
import gym
6-
# from shapely.geometry import Point
76
import numpy as np
87
from scipy.stats import entropy
9-
# import folium
10-
# from folium.plugins import TimestampedGeoJson, AntPath
118

12-
from zoo.CrowdSim.envs.Crowdsim.env.model.utils import *
13-
from zoo.CrowdSim.envs.Crowdsim.env.model.mdp import HumanState, RobotState, JointState
14-
from LightZero.zoo.CrowdSim.envs.Crowdsim.env.crowd_sim_base_config import get_selected_config
9+
from .utils import *
10+
from .mdp import HumanState, RobotState, JointState
11+
from .crowd_sim_base_config import get_selected_config
1512

1613

1714
class CrowdSim(gym.Env):

zoo/CrowdSim/envs/Crowdsim/env/crowd_sim_base_config.py zoo/crowd_sim/envs/CrowdSim/crowd_sim_base_config.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"nlon": 200,
4141
"nlat": 120,
4242
"human_num": 59,
43-
"dataset_dir": '/home/nighoodRen/CrowdSim/CrowdSim/envs/crowd_sim/dataset/purdue/59 users.csv',
43+
"dataset_dir": 'crowd_sim/dataset/purdue/59 users.csv', # TODO
4444
"sensing_range": 23.2, # unit 23.2
4545
"one_uav_action_space": [
4646
[0, 0], [30, 0], [-30, 0], [0, 30], [0, -30], [21, 21], [21, -21], [-21, 21], [-21, -21]
@@ -57,7 +57,7 @@
5757
"nlon": 3600,
5858
"nlat": 2450,
5959
"human_num": 33,
60-
"dataset_dir": '/home/nighoodRen/CrowdSim/CrowdSim/envs/crowd_sim/dataset/NCSU/33 users.csv',
60+
"dataset_dir": 'crowd_sim/dataset/NCSU/33 users.csv', # TODO
6161
"sensing_range": 220, # unit 220
6262
"one_uav_action_space": [
6363
[0, 0], [300, 0], [-300, 0], [0, 300], [0, -300], [210, 210], [210, -210], [-210, 210], [-210, -210]
@@ -74,7 +74,7 @@
7474
"nlon": 2340,
7575
"nlat": 1960,
7676
"human_num": 92,
77-
"dataset_dir": '/home/nighoodRen/CrowdSim/CrowdSim/envs/crowd_sim/dataset/KAIST/92 users.csv',
77+
"dataset_dir": 'crowd_sim/dataset/KAIST/92 users.csv', # TODO
7878
"sensing_range": 220, # unit 220
7979
"one_uav_action_space": [
8080
[0, 0], [300, 0], [-300, 0], [0, 300], [0, -300], [210, 210], [210, -210], [-210, 210], [-210, -210]
File renamed without changes.

zoo/CrowdSim/envs/Crowdsim/env/model/utils.py zoo/crowd_sim/envs/CrowdSim/utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
np.seterr(invalid='ignore')
44

5-
from zoo.CrowdSim.envs.Crowdsim.env.model.agent import *
6-
from zoo.CrowdSim.envs.Crowdsim.env.model.mdp import JointState
5+
from .agent import *
6+
from .mdp import JointState
77
from shapely.geometry import *
88

99

zoo/crowd_sim/envs/__init__.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from gym.envs.registration import register
2+
3+
register(
4+
id='CrowdSim-v0',
5+
entry_point='zoo.crowd_sim.envs.CrowdSim.crowd_sim:CrowdSim',
6+
)

zoo/CrowdSim/envs/CrowdSim_env.py zoo/crowd_sim/envs/crowdsim_env.py

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
from ding.torch_utils import to_ndarray
1111
from ding.utils import ENV_REGISTRY
1212

13-
import zoo.CrowdSim.envs.Crowdsim.env
14-
1513

1614
@ENV_REGISTRY.register('crowdsim_lightzero')
1715
class CrowdSimEnv(BaseEnv):

zoo/CrowdSim/envs/crowdsim_lightzero_env.py zoo/crowd_sim/envs/crowdsim_lightzero_env.py

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
from ding.torch_utils import to_ndarray
1111
from ding.utils import ENV_REGISTRY
1212

13-
import zoo.CrowdSim.envs.Crowdsim.env
14-
1513

1614
@ENV_REGISTRY.register('crowdsim_lightzero')
1715
class CrowdSimEnv(BaseEnv):

zoo/CrowdSim/envs/test_CrowdSim_env.py zoo/crowd_sim/envs/test_crowdsim_env.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
import numpy as np
22
from easydict import EasyDict
3-
from zoo.CrowdSim.envs.CrowdSim_env import CrowdSimEnv
3+
from zoo.crowd_sim.envs.crowdsim_env import CrowdSimEnv
44

55
mcfg = EasyDict(
66
env_name='CrowdSim-v0',
77
dataset='purdue',
88
robot_num=2,
99
human_num=59, # purdue
10-
one_uav_action_space=[[0, 0], [30, 0], [-30, 0], [0, 30], [0, -30]]
10+
one_uav_action_space=[[0, 0], [30, 0], [-30, 0], [0, 30], [0, -30]],
11+
obs_mode = '2-dim-array',
12+
env_mode = 'hard',
13+
transmit_v=120,
14+
collect_v_prob = {'1': 1, '2': 0},
1115
)
1216

1317

zoo/CrowdSim/envs/test_crowdsim_lightzero_env.py zoo/crowd_sim/envs/test_crowdsim_lightzero_env.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import numpy as np
22
import pytest
33
from easydict import EasyDict
4-
from zoo.CrowdSim.envs.crowdsim_lightzero_env import CrowdSimEnv
4+
from zoo.crowd_sim.envs.crowdsim_lightzero_env import CrowdSimEnv
55

66
mcfg=EasyDict(
77
env_name='CrowdSim-v0',
@@ -61,7 +61,7 @@ def test_obs_1_dim_array(self):
6161
mcfg['obs_mode'] = '1-dim-array'
6262
env = CrowdSimEnv(mcfg)
6363
env.seed(314)
64-
env.enable_save_replay('/home/nighoodRen/LightZero/result/test_replay')
64+
env.enable_save_replay('./LightZero/result/test_replay')
6565
assert env._seed == 314
6666
obs = env.reset()
6767
assert obs['observation'].shape == (244, )

0 commit comments

Comments
 (0)