andrewzhang505
commited on
Commit
•
3cbf7a2
1
Parent(s):
14cce34
Upload with huggingface_hub
Browse files- .gitattributes +1 -0
- .summary/0/events.out.tfevents.1657324804.andrew-gpu +3 -0
- README.md +11 -0
- cfg.json +210 -0
- checkpoint_p0/checkpoint_001268618_1299064832.pth +3 -0
- checkpoint_p0/checkpoint_001269222_1299683328.pth +3 -0
- checkpoint_p0/checkpoint_001269227_1299688448.pth +3 -0
- checkpoint_p0/milestones/checkpoint_000000001_1024.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000054734_56047616.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000111116_113782784.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000167605_171627520.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000224123_229501952.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000280117_286839808.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000335866_343926784.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000391577_400974848.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000447377_458114048.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000503281_515359744.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000559040_572456960.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000614441_629187584.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000668898_684951552.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000723591_740957184.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000778122_796796928.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000832691_852675584.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000887213_908506112.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000941821_964424704.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_000996419_1020333056.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_001051062_1076287488.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_001106238_1132787712.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_001160911_1188772864.pth.milestone +0 -0
- checkpoint_p0/milestones/checkpoint_001215664_1244839936.pth.milestone +0 -0
- git.diff +37 -0
- sf_log.txt +3 -0
.gitattributes
CHANGED
@@ -25,3 +25,4 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
|
25 |
*.zip filter=lfs diff=lfs merge=lfs -text
|
26 |
*.zstandard filter=lfs diff=lfs merge=lfs -text
|
27 |
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
|
|
|
25 |
*.zip filter=lfs diff=lfs merge=lfs -text
|
26 |
*.zstandard filter=lfs diff=lfs merge=lfs -text
|
27 |
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
28 |
+
sf_log.txt filter=lfs diff=lfs merge=lfs -text
|
.summary/0/events.out.tfevents.1657324804.andrew-gpu
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
1 |
+
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:99a9b31f9f2598074d7bc8a03de29a0a685c7aa9901e908859358dde4086e088
|
3 |
+
size 89172510
|
README.md
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
---
|
2 |
+
library_name: sample-factory
|
3 |
+
tags:
|
4 |
+
- deep-reinforcement-learning
|
5 |
+
- reinforcement-learning
|
6 |
+
- sample-factory
|
7 |
+
---
|
8 |
+
|
9 |
+
A(n) **APPO** model trained on the **quadrotor_multi** environment.
|
10 |
+
This model was trained using Sample Factory 2.0: https://github.com/alex-petrenko/sample-factory
|
11 |
+
|
cfg.json
ADDED
@@ -0,0 +1,210 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"algo": "APPO",
|
3 |
+
"env": "quadrotor_multi",
|
4 |
+
"experiment": "00_baseline_see_0",
|
5 |
+
"experiments_root": "quad_single_baseline/baseline_",
|
6 |
+
"help": false,
|
7 |
+
"train_dir": "./train_dir",
|
8 |
+
"device": "gpu",
|
9 |
+
"seed": 0,
|
10 |
+
"save_every_sec": 120,
|
11 |
+
"keep_checkpoints": 3,
|
12 |
+
"save_milestones_sec": 10000,
|
13 |
+
"stats_avg": 100,
|
14 |
+
"learning_rate": 0.0001,
|
15 |
+
"lr_schedule": "constant",
|
16 |
+
"lr_schedule_kl_threshold": 0.008,
|
17 |
+
"train_for_env_steps": 10000000000,
|
18 |
+
"train_for_seconds": 10000000000,
|
19 |
+
"obs_subtract_mean": 0.0,
|
20 |
+
"obs_scale": 1.0,
|
21 |
+
"gamma": 0.99,
|
22 |
+
"reward_scale": 1.0,
|
23 |
+
"reward_clip": 10.0,
|
24 |
+
"encoder_type": "mlp",
|
25 |
+
"encoder_subtype": "mlp_quads",
|
26 |
+
"encoder_custom": "quad_multi_encoder",
|
27 |
+
"encoder_extra_fc_layers": 0,
|
28 |
+
"hidden_size": 16,
|
29 |
+
"nonlinearity": "tanh",
|
30 |
+
"policy_initialization": "xavier_uniform",
|
31 |
+
"policy_init_gain": 1.0,
|
32 |
+
"actor_critic_share_weights": false,
|
33 |
+
"use_spectral_norm": false,
|
34 |
+
"adaptive_stddev": false,
|
35 |
+
"initial_stddev": 1.0,
|
36 |
+
"experiment_summaries_interval": 20,
|
37 |
+
"adam_eps": 1e-06,
|
38 |
+
"adam_beta1": 0.9,
|
39 |
+
"adam_beta2": 0.999,
|
40 |
+
"gae_lambda": 1.0,
|
41 |
+
"rollout": 128,
|
42 |
+
"num_workers": 36,
|
43 |
+
"recurrence": 1,
|
44 |
+
"use_rnn": false,
|
45 |
+
"rnn_type": "gru",
|
46 |
+
"rnn_num_layers": 1,
|
47 |
+
"ppo_clip_ratio": 0.1,
|
48 |
+
"ppo_clip_value": 5.0,
|
49 |
+
"batch_size": 1024,
|
50 |
+
"num_batches_per_iteration": 1,
|
51 |
+
"ppo_epochs": 1,
|
52 |
+
"num_minibatches_to_accumulate": -1,
|
53 |
+
"max_grad_norm": 5.0,
|
54 |
+
"exploration_loss_coeff": 0.0,
|
55 |
+
"value_loss_coeff": 0.5,
|
56 |
+
"kl_loss_coeff": 0.0,
|
57 |
+
"exploration_loss": "entropy",
|
58 |
+
"max_entropy_coeff": 0.0,
|
59 |
+
"num_envs_per_worker": 4,
|
60 |
+
"worker_num_splits": 2,
|
61 |
+
"num_policies": 1,
|
62 |
+
"policy_workers_per_policy": 1,
|
63 |
+
"max_policy_lag": 100000000,
|
64 |
+
"traj_buffers_excess_ratio": 1.3,
|
65 |
+
"decorrelate_experience_max_seconds": 10,
|
66 |
+
"decorrelate_envs_on_one_worker": true,
|
67 |
+
"with_vtrace": false,
|
68 |
+
"vtrace_rho": 1.0,
|
69 |
+
"vtrace_c": 1.0,
|
70 |
+
"set_workers_cpu_affinity": true,
|
71 |
+
"force_envs_single_thread": true,
|
72 |
+
"reset_timeout_seconds": 120,
|
73 |
+
"default_niceness": 0,
|
74 |
+
"train_in_background_thread": true,
|
75 |
+
"learner_main_loop_num_cores": 1,
|
76 |
+
"actor_worker_gpus": [],
|
77 |
+
"with_pbt": false,
|
78 |
+
"pbt_mix_policies_in_one_env": true,
|
79 |
+
"pbt_period_env_steps": 5000000,
|
80 |
+
"pbt_start_mutation": 20000000,
|
81 |
+
"pbt_replace_fraction": 0.3,
|
82 |
+
"pbt_mutation_rate": 0.15,
|
83 |
+
"pbt_replace_reward_gap": 0.1,
|
84 |
+
"pbt_replace_reward_gap_absolute": 1e-06,
|
85 |
+
"pbt_optimize_batch_size": false,
|
86 |
+
"pbt_optimize_gamma": false,
|
87 |
+
"pbt_target_objective": "true_reward",
|
88 |
+
"pbt_perturb_min": 1.05,
|
89 |
+
"pbt_perturb_max": 1.5,
|
90 |
+
"use_cpc": false,
|
91 |
+
"cpc_forward_steps": 8,
|
92 |
+
"cpc_time_subsample": 6,
|
93 |
+
"cpc_forward_subsample": 2,
|
94 |
+
"with_wandb": true,
|
95 |
+
"wandb_user": null,
|
96 |
+
"wandb_project": "sample_factory",
|
97 |
+
"wandb_group": null,
|
98 |
+
"wandb_job_type": "SF",
|
99 |
+
"wandb_tags": [
|
100 |
+
"swarm-rl",
|
101 |
+
"sf1",
|
102 |
+
"single"
|
103 |
+
],
|
104 |
+
"benchmark": false,
|
105 |
+
"sampler_only": false,
|
106 |
+
"env_frameskip": 1,
|
107 |
+
"env_framestack": 4,
|
108 |
+
"pixel_format": "CHW",
|
109 |
+
"quads_discretize_actions": -1,
|
110 |
+
"quads_clip_input": false,
|
111 |
+
"quads_effort_reward": null,
|
112 |
+
"quads_episode_duration": 15.0,
|
113 |
+
"quads_num_agents": 1,
|
114 |
+
"quads_neighbor_hidden_size": 256,
|
115 |
+
"quads_neighbor_encoder_type": "no_encoder",
|
116 |
+
"quads_collision_reward": 5.0,
|
117 |
+
"quads_collision_obstacle_reward": 0.0,
|
118 |
+
"quads_settle_reward": 0.0,
|
119 |
+
"quads_settle": false,
|
120 |
+
"quads_vel_reward_out_range": 0.8,
|
121 |
+
"quads_settle_range_meters": 1.0,
|
122 |
+
"quads_collision_hitbox_radius": 2.0,
|
123 |
+
"quads_collision_falloff_radius": 4.0,
|
124 |
+
"quads_collision_smooth_max_penalty": 10.0,
|
125 |
+
"neighbor_obs_type": "none",
|
126 |
+
"quads_use_numba": true,
|
127 |
+
"quads_obstacle_mode": "no_obstacles",
|
128 |
+
"quads_obstacle_num": 0,
|
129 |
+
"quads_obstacle_type": "sphere",
|
130 |
+
"quads_obstacle_size": 0.0,
|
131 |
+
"quads_obstacle_traj": "gravity",
|
132 |
+
"quads_local_obs": -1,
|
133 |
+
"quads_local_coeff": 1.0,
|
134 |
+
"quads_local_metric": "dist",
|
135 |
+
"quads_view_mode": "local",
|
136 |
+
"quads_adaptive_env": false,
|
137 |
+
"quads_mode": "mix",
|
138 |
+
"quads_formation": "circle_horizontal",
|
139 |
+
"quads_formation_size": 0.0,
|
140 |
+
"room_dims": [
|
141 |
+
10,
|
142 |
+
10,
|
143 |
+
10
|
144 |
+
],
|
145 |
+
"quads_obs_repr": "xyz_vxyz_R_omega",
|
146 |
+
"replay_buffer_sample_prob": 0.0,
|
147 |
+
"anneal_collision_steps": 0.0,
|
148 |
+
"quads_obstacle_obs_mode": "relative",
|
149 |
+
"quads_obstacle_hidden_size": 32,
|
150 |
+
"quads_collision_obst_smooth_max_penalty": 10.0,
|
151 |
+
"quads_obst_penalty_fall_off": 10.0,
|
152 |
+
"command_line": "--env=quadrotor_multi --train_for_env_steps=1000000000 --algo=APPO --use_rnn=False --num_workers=36 --num_envs_per_worker=4 --learning_rate=0.0001 --ppo_clip_value=5.0 --recurrence=1 --nonlinearity=tanh --actor_critic_share_weights=False --policy_initialization=xavier_uniform --adaptive_stddev=False --with_vtrace=False --max_policy_lag=100000000 --hidden_size=256 --gae_lambda=1.00 --max_grad_norm=5.0 --exploration_loss_coeff=0.0 --rollout=128 --batch_size=1024 --quads_use_numba=True --quads_mode=mix --quads_episode_duration=15.0 --quads_formation_size=0.0 --encoder_custom=quad_multi_encoder --with_pbt=False --quads_collision_reward=5.0 --quads_neighbor_hidden_size=256 --neighbor_obs_type=pos_vel --quads_settle_reward=0.0 --quads_collision_hitbox_radius=2.0 --quads_collision_falloff_radius=4.0 --quads_local_obs=6 --quads_local_metric=dist --quads_local_coeff=1.0 --quads_num_agents=8 --quads_collision_reward=5.0 --quads_collision_smooth_max_penalty=10.0 --quads_neighbor_encoder_type=attention --replay_buffer_sample_prob=0.75 --anneal_collision_steps=300000000 --train_for_env_steps=10000000000 --hidden_size=16 --neighbor_obs_type=none --quads_local_obs=-1 --quads_num_agents=1 --replay_buffer_sample_prob=0.0 --anneal_collision_steps=0 --save_milestones_sec=10000 --quads_neighbor_encoder_type=no_encoder --with_wandb=True --wandb_tags swarm-rl sf1 single --seed=0 --experiment=00_baseline_see_0 --train_dir=./train_dir --experiments_root=quad_single_baseline/baseline_",
|
153 |
+
"cli_args": {
|
154 |
+
"algo": "APPO",
|
155 |
+
"env": "quadrotor_multi",
|
156 |
+
"experiment": "00_baseline_see_0",
|
157 |
+
"experiments_root": "quad_single_baseline/baseline_",
|
158 |
+
"train_dir": "./train_dir",
|
159 |
+
"seed": 0,
|
160 |
+
"save_milestones_sec": 10000,
|
161 |
+
"learning_rate": 0.0001,
|
162 |
+
"train_for_env_steps": 10000000000,
|
163 |
+
"encoder_custom": "quad_multi_encoder",
|
164 |
+
"hidden_size": 16,
|
165 |
+
"nonlinearity": "tanh",
|
166 |
+
"policy_initialization": "xavier_uniform",
|
167 |
+
"actor_critic_share_weights": false,
|
168 |
+
"adaptive_stddev": false,
|
169 |
+
"gae_lambda": 1.0,
|
170 |
+
"rollout": 128,
|
171 |
+
"num_workers": 36,
|
172 |
+
"recurrence": 1,
|
173 |
+
"use_rnn": false,
|
174 |
+
"ppo_clip_value": 5.0,
|
175 |
+
"batch_size": 1024,
|
176 |
+
"max_grad_norm": 5.0,
|
177 |
+
"exploration_loss_coeff": 0.0,
|
178 |
+
"num_envs_per_worker": 4,
|
179 |
+
"max_policy_lag": 100000000,
|
180 |
+
"with_vtrace": false,
|
181 |
+
"with_pbt": false,
|
182 |
+
"with_wandb": true,
|
183 |
+
"wandb_tags": [
|
184 |
+
"swarm-rl",
|
185 |
+
"sf1",
|
186 |
+
"single"
|
187 |
+
],
|
188 |
+
"quads_episode_duration": 15.0,
|
189 |
+
"quads_num_agents": 1,
|
190 |
+
"quads_neighbor_hidden_size": 256,
|
191 |
+
"quads_neighbor_encoder_type": "no_encoder",
|
192 |
+
"quads_collision_reward": 5.0,
|
193 |
+
"quads_settle_reward": 0.0,
|
194 |
+
"quads_collision_hitbox_radius": 2.0,
|
195 |
+
"quads_collision_falloff_radius": 4.0,
|
196 |
+
"quads_collision_smooth_max_penalty": 10.0,
|
197 |
+
"neighbor_obs_type": "none",
|
198 |
+
"quads_use_numba": true,
|
199 |
+
"quads_local_obs": -1,
|
200 |
+
"quads_local_coeff": 1.0,
|
201 |
+
"quads_local_metric": "dist",
|
202 |
+
"quads_mode": "mix",
|
203 |
+
"quads_formation_size": 0.0,
|
204 |
+
"replay_buffer_sample_prob": 0.0,
|
205 |
+
"anneal_collision_steps": 0.0
|
206 |
+
},
|
207 |
+
"git_hash": "7f0b112fb802e279ad83b0391d962b665dc44ba1",
|
208 |
+
"git_repo_name": "https://github.com/Zhehui-Huang/quad-swarm-rl.git",
|
209 |
+
"wandb_unique_id": "00_baseline_see_0_20220709_000003_519217"
|
210 |
+
}
|
checkpoint_p0/checkpoint_001268618_1299064832.pth
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
1 |
+
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:ec8f3003537fcb3de26bc3901f2f8e8de82442c3fe876d483dc349f351d060d2
|
3 |
+
size 44812
|
checkpoint_p0/checkpoint_001269222_1299683328.pth
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
1 |
+
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:763d1511c400714ca4cdd4e7a06eeb91006f99b6a32abc5b172b6e5bf8adacde
|
3 |
+
size 44812
|
checkpoint_p0/checkpoint_001269227_1299688448.pth
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
1 |
+
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:0a1e13070552c3dcbdc1add4b35d7d041f0da0f2efc374b432738b54e82b393b
|
3 |
+
size 44812
|
checkpoint_p0/milestones/checkpoint_000000001_1024.pth.milestone
ADDED
Binary file (44.7 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000054734_56047616.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000111116_113782784.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000167605_171627520.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000224123_229501952.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000280117_286839808.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000335866_343926784.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000391577_400974848.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000447377_458114048.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000503281_515359744.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000559040_572456960.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000614441_629187584.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000668898_684951552.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000723591_740957184.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000778122_796796928.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000832691_852675584.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000887213_908506112.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000941821_964424704.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_000996419_1020333056.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_001051062_1076287488.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_001106238_1132787712.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_001160911_1188772864.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
checkpoint_p0/milestones/checkpoint_001215664_1244839936.pth.milestone
ADDED
Binary file (44.8 kB). View file
|
|
git.diff
ADDED
@@ -0,0 +1,37 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/gym_art/quadrotor_multi/quad_scenarios.py b/gym_art/quadrotor_multi/quad_scenarios.py
|
2 |
+
index 9f9eb59..b955f9e 100644
|
3 |
+
--- a/gym_art/quadrotor_multi/quad_scenarios.py
|
4 |
+
+++ b/gym_art/quadrotor_multi/quad_scenarios.py
|
5 |
+
@@ -4,7 +4,7 @@ import copy
|
6 |
+
|
7 |
+
from gym_art.quadrotor_multi.quad_scenarios_utils import QUADS_PARAMS_DICT, update_formation_and_max_agent_per_layer, \
|
8 |
+
update_layer_dist, get_formation_range, get_goal_by_formation, get_z_value, QUADS_MODE_LIST, \
|
9 |
+
- QUADS_MODE_LIST_OBSTACLES
|
10 |
+
+ QUADS_MODE_LIST_OBSTACLES, QUADS_MODE_LIST_SIMPLE
|
11 |
+
from gym_art.quadrotor_multi.quad_utils import generate_points, get_grid_dim_number
|
12 |
+
|
13 |
+
|
14 |
+
@@ -623,7 +623,9 @@ class Scenario_mix(QuadrotorScenario):
|
15 |
+
# Once change the parameter here, should also update QUADS_PARAMS_DICT to make sure it is same as run a single scenario
|
16 |
+
# key: quads_mode
|
17 |
+
# value: 0. formation, 1: [formation_low_size, formation_high_size], 2: episode_time
|
18 |
+
- if obst_mode == 'no_obstacles':
|
19 |
+
+ if num_agents == 1:
|
20 |
+
+ self.quads_mode_list = QUADS_MODE_LIST_SIMPLE
|
21 |
+
+ elif obst_mode == 'no_obstacles':
|
22 |
+
self.quads_mode_list = QUADS_MODE_LIST
|
23 |
+
else:
|
24 |
+
self.quads_mode_list = QUADS_MODE_LIST_OBSTACLES
|
25 |
+
diff --git a/gym_art/quadrotor_multi/quad_utils.py b/gym_art/quadrotor_multi/quad_utils.py
|
26 |
+
index d56c5d5..a8792fc 100644
|
27 |
+
--- a/gym_art/quadrotor_multi/quad_utils.py
|
28 |
+
+++ b/gym_art/quadrotor_multi/quad_utils.py
|
29 |
+
@@ -208,7 +208,7 @@ def points_in_sphere(n, x):
|
30 |
+
|
31 |
+
def generate_points(n=3):
|
32 |
+
if n < 3:
|
33 |
+
- print("The number of goals can not smaller than 3, The system has cast it to 3")
|
34 |
+
+ # print("The number of goals can not smaller than 3, The system has cast it to 3")
|
35 |
+
n = 3
|
36 |
+
return points_in_sphere(n, 0.1 + 1.2 * n)
|
37 |
+
|
sf_log.txt
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
1 |
+
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:c42fef3b200866dc2bf0a4d8b9cec111ed8e95631df791eefb1df7013bbbfa94
|
3 |
+
size 26137465
|