Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Corentin/improve init fns #73

Merged
merged 7 commits into from
Apr 11, 2024
Merged

Corentin/improve init fns #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5acf3de
Rename n_agents and n_objects to max_*
corentinlger Apr 4, 2024
c030d1c
Rename nve_state to entities_state
corentinlger Apr 4, 2024
58264b0
Change PRNG system in states generation
corentinlger Apr 4, 2024
cc479ad
Merge branch 'main' of github.com:clement-moulin-frier/vivarium into …
corentinlger Apr 11, 2024
25f7e6e
Fix hydra problems with new init system and add physics_engine name
corentinlger Apr 11, 2024
56e34c7
Clean state file
corentinlger Apr 11, 2024
0a6bc92
Rename init_nve init_entities
corentinlger Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions conf/scene/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
simulator:
n_agents: 10
n_objects: 2
max_agents: 10
max_objects: 2
box_size: 100.0
num_steps_lax: 4
dt: 0.1
Expand All @@ -11,7 +11,7 @@ simulator:
collision_eps: 0.1
collision_alpha: 0.5

nve:
entities:
diameter: 5.
friction: 0.1
mass_center: 1.
Expand Down
4 changes: 2 additions & 2 deletions conf/scene/session_1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
simulator:
n_agents: 1
n_objects: 1
max_agents: 1
max_objects: 1
16 changes: 9 additions & 7 deletions scripts/run_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
from vivarium.simulator.states import init_simulator_state
from vivarium.simulator.states import init_agent_state
from vivarium.simulator.states import init_object_state
from vivarium.simulator.states import init_nve_state
from vivarium.simulator.states import init_entities_state
from vivarium.simulator.states import init_state
from vivarium.simulator.simulator import Simulator
from vivarium.simulator.sim_computation import dynamics_rigid
from vivarium.simulator.physics_engine import dynamics_rigid
from vivarium.simulator.grpc_server.simulator_server import serve

lg = logging.getLogger(__name__)
Expand All @@ -27,12 +27,14 @@ def main(cfg: DictConfig = None) -> None:

objects_state = init_object_state(simulator_state=simulator_state, **args.objects)

nve_state = init_nve_state(simulator_state=simulator_state, **args.nve)
entities_state = init_entities_state(simulator_state=simulator_state, **args.entities)

state = init_state(simulator_state=simulator_state,
agents_state=agents_state,
objects_state=objects_state,
nve_state=nve_state)
state = init_state(
simulator_state=simulator_state,
agents_state=agents_state,
objects_state=objects_state,
entities_state=entities_state
)

simulator = Simulator(state, behaviors.behavior_bank, dynamics_rigid)

Expand Down
18 changes: 10 additions & 8 deletions scripts/run_simulation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import hydra
import logging
import hydra

from omegaconf import DictConfig, OmegaConf

from vivarium.simulator import behaviors
from vivarium.simulator.states import init_simulator_state
from vivarium.simulator.states import init_agent_state
from vivarium.simulator.states import init_object_state
from vivarium.simulator.states import init_nve_state
from vivarium.simulator.states import init_entities_state
from vivarium.simulator.states import init_state
from vivarium.simulator.simulator import Simulator
from vivarium.simulator.sim_computation import dynamics_rigid
from vivarium.simulator.physics_engine import dynamics_rigid

lg = logging.getLogger(__name__)

Expand All @@ -26,12 +26,14 @@ def main(cfg: DictConfig = None) -> None:

objects_state = init_object_state(simulator_state=simulator_state, **args.objects)

nve_state = init_nve_state(simulator_state=simulator_state, **args.nve)
entities_state = init_entities_state(simulator_state=simulator_state, **args.entities)

state = init_state(simulator_state=simulator_state,
agents_state=agents_state,
objects_state=objects_state,
nve_state=nve_state)
state = init_state(
simulator_state=simulator_state,
agents_state=agents_state,
objects_state=objects_state,
entities_state=entities_state
)

simulator = Simulator(state, behaviors.behavior_bank, dynamics_rigid)

Expand Down
18 changes: 9 additions & 9 deletions tests/test_simulator_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from vivarium.simulator.states import init_simulator_state
from vivarium.simulator.states import init_agent_state
from vivarium.simulator.states import init_object_state
from vivarium.simulator.states import init_nve_state
from vivarium.simulator.states import init_entities_state
from vivarium.simulator.states import init_state
from vivarium.simulator.simulator import Simulator
from vivarium.simulator.sim_computation import dynamics_rigid
Expand All @@ -13,13 +13,13 @@ def test_init_simulator_no_args():
simulator_state = init_simulator_state()
agents_state = init_agent_state(simulator_state=simulator_state)
objects_state = init_object_state(simulator_state=simulator_state)
nve_state = init_nve_state(simulator_state=simulator_state)
entities_state = init_entities_state(simulator_state=simulator_state)

state = init_state(
simulator_state=simulator_state,
agents_state=agents_state,
objects_state=objects_state,
nve_state=nve_state
entities_state=entities_state
)

simulator = Simulator(state, behaviors.behavior_bank, dynamics_rigid)
Expand All @@ -30,8 +30,8 @@ def test_init_simulator_no_args():
def test_init_simulator_args():
""" Test the initialization of state with arguments """
box_size = 100.0
n_agents = 10
n_objects = 2
max_agents = 10
max_objects = 2
col_eps = 0.1
col_alpha = 0.5

Expand All @@ -47,12 +47,12 @@ def test_init_simulator_args():

simulator_state = init_simulator_state(
box_size=box_size,
n_agents=n_agents,
n_objects=n_objects,
max_agents=max_agents,
max_objects=max_objects,
collision_eps=col_eps,
collision_alpha=col_alpha)

nve_state = init_nve_state(
entities_state = init_entities_state(
simulator_state,
diameter=diameter,
friction=friction)
Expand All @@ -74,7 +74,7 @@ def test_init_simulator_args():
simulator_state=simulator_state,
agents_state=agent_state,
objects_state=object_state,
nve_state=nve_state)
entities_state=entities_state)

simulator = Simulator(state, behaviors.behavior_bank, dynamics_rigid)

Expand Down
6 changes: 3 additions & 3 deletions tests/test_simulator_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from vivarium.simulator.states import init_simulator_state
from vivarium.simulator.states import init_agent_state
from vivarium.simulator.states import init_object_state
from vivarium.simulator.states import init_nve_state
from vivarium.simulator.states import init_entities_state
from vivarium.simulator.states import init_state
from vivarium.simulator.simulator import Simulator
from vivarium.simulator.sim_computation import dynamics_rigid
Expand All @@ -16,13 +16,13 @@ def test_simulator_run():

objects_state = init_object_state(simulator_state=simulator_state)

nve_state = init_nve_state(simulator_state=simulator_state)
entities_state = init_entities_state(simulator_state=simulator_state)

state = init_state(
simulator_state=simulator_state,
agents_state=agents_state,
objects_state=objects_state,
nve_state=nve_state
entities_state=entities_state
)

simulator = Simulator(state, behaviors.behavior_bank, dynamics_rigid)
Expand Down
4 changes: 2 additions & 2 deletions vivarium/controllers/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ def __init__(self, **params):
class SimulatorConfig(Config):
idx = param.Integer(0, constant=True)
box_size = param.Number(100., bounds=(0, None))
n_agents = param.Integer(10)
n_objects = param.Integer(2)
max_agents = param.Integer(10)
max_objects = param.Integer(2)
num_steps_lax = param.Integer(4)
dt = param.Number(0.1)
freq = param.Number(40., allow_None=True)
Expand Down
Loading
Loading