Skip to content

Commit

Permalink
Merge pull request #105 from matrx-software/#82_build_and_distribute_…
Browse files Browse the repository at this point in the history
…via_pypi_fixes

#82 build and distribute via pypi fixes
  • Loading branch information
jwaa committed Mar 10, 2020
2 parents 824e16c + 3ebbb14 commit 7a18699
Show file tree
Hide file tree
Showing 15 changed files with 97 additions and 168 deletions.
6 changes: 3 additions & 3 deletions main.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from matrx.API import api
from matrx.api import api
from matrx.scenarios import simple_scenario, test_scenario, new_vis_test

if __name__ == "__main__":
Expand All @@ -7,12 +7,12 @@
# future) through a UI.
factory = new_vis_test.create_factory()

# startup world-overarching MATRX scripts, such as the API and/or visualizer if requested
# startup world-overarching MATRX scripts, such as the api and/or visualizer if requested
factory.startup()

# run each world
for world in factory.worlds():
world.run(factory.api_info)

# stop MATRX scripts such as the API and visualizer (if used)
# stop MATRX scripts such as the api and visualizer (if used)
factory.stop()
85 changes: 0 additions & 85 deletions matrx/API/logMatrx.py

This file was deleted.

4 changes: 2 additions & 2 deletions matrx/agents/agent_brain.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def filter_observations(self, state):
Since the grid world returns ALL properties of ALL objects within a certain range(s), but perhaps some objects
are obscured because they are behind walls, or an agent is not able to see some properties of certain objects.
This method is separated from the decide_on_action() method because its return value is send to the API as well
This method is separated from the decide_on_action() method because its return value is send to the api as well
to allows the agent's interface to only show that knowledge the agent is aware of.
A number of utility methods exist to help filter and memorize states. See <TODO>
Expand Down Expand Up @@ -422,7 +422,7 @@ def _set_rnd_seed(self, seed):
# directed at every agent.
#
# This is a static method such that it can also be accessed and used outside of this thread / the GridWorld loop.
# Such as by the API.
# Such as by the api.
#
# Note; This method should NOT be overridden!
#
Expand Down
4 changes: 2 additions & 2 deletions matrx/agents/human_agent_brain.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def _get_action(self, state, agent_properties, agent_id, userinput):
The function overwrites the default get_action() function for normal agents,
and instead executes the action commanded by the user, which is received
via the API from e.g. a visualization interface.
via the api from e.g. a visualization interface.
Note; This method should NOT be overridden!
Expand All @@ -84,7 +84,7 @@ def _get_action(self, state, agent_properties, agent_id, userinput):
:param agent_properties: The properties of the agent, which might have been changed by the
environment as a result of actions of this or other agents.
:param agent_id: the ID of this agent
:param userinput: any userinput given by the user for this human agent via the API
:param userinput: any userinput given by the user for this human agent via the api
:return: The filtered state of this agent, the agent properties which the agent might have changed,
and an action string, which is the class name of one of the actions in the Action package.
"""
Expand Down
File renamed without changes.

0 comments on commit 7a18699

Please sign in to comment.