Skip to content

Fix sorting actions #37

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

Open
e-dzia wants to merge 90 commits into
base: master
Choose a base branch
from
Open

Fix sorting actions #37

Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
1cb8fca
Initial commit
khozzy Aug 20, 2017
1be29d2
Init commit
Aug 20, 2017
d84899f
PRNG and rendering the environment
Aug 21, 2017
57dcb08
Setup.py file updated
Aug 28, 2017
a3a0f2b
Initial position
Aug 28, 2017
590afd4
Animat icon changed
Aug 28, 2017
33a183d
New environments added
Sep 7, 2017
22e0570
Do not render the environment all the time
Sep 7, 2017
7e4e170
Added Travis file
Sep 7, 2017
506fb45
Dummy Travis instruction
Sep 7, 2017
a9d6dbe
Typo corrected
Sep 8, 2017
f3d3eb0
Getting all possible transitions
Sep 8, 2017
cd25554
Gym version updated
Nov 4, 2017
046fd5c
Add Woods1 environment
Nov 7, 2017
719ec07
tests, import, versions fixed
Nov 7, 2017
c61ec17
Boolean Multiplexer environment
Nov 18, 2017
b599b88
Better package naming
Nov 18, 2017
9c36c87
Validation bit for multiplexer
Nov 20, 2017
149334b
Bump version
Nov 20, 2017
1263547
Fix perception string issue
Nov 21, 2017
2ad1126
Setup file changes
Feb 6, 2018
5d48e00
Maze4, Maze6, Woods14 added
Feb 19, 2018
6ab0d2e
Version bumped
Feb 19, 2018
b441b44
Add bigger multiplexer problems
Mar 5, 2018
92a83c2
RC
Mar 19, 2018
a36dc34
Fixes to Travis config file
Mar 19, 2018
80d7b24
Skip cleanup in travis
Mar 19, 2018
5a3d6f4
Real Multiplexer
Jun 26, 2018
f42c440
Fix boolean MPX states
Jun 26, 2018
7613852
added function _run_action_planning
e-dzia Jul 4, 2018
e172393
added explanatory comments
e-dzia Jul 8, 2018
f4a5be8
Merge branch 'master' of http://github.com/e-dzia/pyalcs-private
e-dzia Jul 8, 2018
950870f
added handeye env (not finished)
e-dzia Aug 28, 2018
4eb972b
changed calculate_performance function
e-dzia Aug 29, 2018
d1681c5
failed merge
e-dzia Aug 30, 2018
c9b3413
Revert "failed merge"
e-dzia Aug 30, 2018
364bcd1
action planning in progress
e-dzia Aug 31, 2018
c335d1e
implemented exists_classifier in ClassifiersList
e-dzia Aug 31, 2018
2ba36cf
merged with action_planning branch
e-dzia Sep 18, 2018
9e222b1
merged with ParrotPrediction/master
e-dzia Sep 18, 2018
7d74761
working on TypeError: 'Perception' object does not support item assig…
e-dzia Sep 18, 2018
22fb4ec
made some changes to be compatible with ParrotPrediction/masteR
e-dzia Sep 19, 2018
dd23a8a
undid some changes in original C++ code
e-dzia Sep 19, 2018
7bd9ad0
deleted unused imports from examples/handeye
e-dzia Sep 19, 2018
93bab07
fixed line length
e-dzia Sep 19, 2018
136c5ff
added strategies/action_planning.py
e-dzia Sep 19, 2018
ab275f2
moved searching goal sequence to another class and added tests
e-dzia Sep 20, 2018
10d6608
added script to plot results
e-dzia Sep 20, 2018
a622a47
added some graphs
e-dzia Sep 21, 2018
8488943
added most required changes in code
e-dzia Sep 22, 2018
be96cf4
something went wrong
e-dzia Sep 25, 2018
5bb851a
Revert "something went wrong"
e-dzia Sep 25, 2018
d6cdb29
fixed tests
e-dzia Sep 25, 2018
9491017
added type hinting in action_planning.py
e-dzia Sep 25, 2018
022d976
added type hinting in Classifier.py
e-dzia Sep 25, 2018
2860274
added type hinting in agents/acs2
e-dzia Sep 25, 2018
6de71e1
added type hinting in strategies/action_planning
e-dzia Sep 25, 2018
bc8b851
type hinting is now in every function
e-dzia Sep 26, 2018
dcdc4e2
merge with ParrotPrediction/master
e-dzia Sep 26, 2018
9edee9d
more changes because of the last merge
e-dzia Sep 26, 2018
a9fd61b
merge with ap-rev-09-22
e-dzia Sep 26, 2018
8f86eb6
added notebooks
e-dzia Sep 26, 2018
cb7ed26
added notebook
e-dzia Sep 27, 2018
1393451
result_handeye works
e-dzia Sep 27, 2018
5908f97
results_handeye makes plots for both ap and no ap
e-dzia Sep 27, 2018
512c2ea
results_handeye makes plots for both ap and no ap
e-dzia Sep 27, 2018
6ef1422
line was too long
e-dzia Sep 27, 2018
f42a323
ready to test
e-dzia Sep 28, 2018
58058e6
changed titles in results_handeye
e-dzia Oct 2, 2018
660e882
added results for 100 experiments
e-dzia Oct 3, 2018
ee6ae20
rename results_handeye
e-dzia Oct 3, 2018
de86fee
renamed directories
e-dzia Oct 3, 2018
9de1811
added notebook with 100 experiments
e-dzia Oct 3, 2018
77fc328
merged ap-rev-09-22
e-dzia Oct 3, 2018
8510f92
changes due to PEP8
e-dzia Oct 3, 2018
df83e28
changes due to PEP8 etc
e-dzia Oct 3, 2018
3f076a5
minor changes
e-dzia Oct 3, 2018
a084077
tests for search one for/backward step
e-dzia Oct 3, 2018
7a307ef
test for search goal sequence
e-dzia Oct 3, 2018
0a6ffea
added tests for HandEye
e-dzia Oct 3, 2018
8b15476
experiments of HandEye4
e-dzia Oct 4, 2018
fad7243
Merge branch 'ap-tests'
e-dzia Oct 4, 2018
4e83ab7
added results for HandEye5
e-dzia Oct 5, 2018
e7bbc91
required changes
e-dzia Oct 6, 2018
8073e46
updated notebooks and deleted pdf result files
e-dzia Oct 6, 2018
d646697
added important mean results
e-dzia Oct 6, 2018
360387c
moved HandEye notebook to notebooks dir
e-dzia Oct 10, 2018
69f6cbc
added important pdfs
e-dzia Oct 10, 2018
f516951
fix: sorting when one element is NoneType
e-dzia Oct 30, 2018
8d8fe92
Merge remote-tracking branch 'parrot/master' into sort-fix
e-dzia Nov 2, 2018
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
2 changes: 1 addition & 1 deletion lcs/strategies/action_selection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def choose_action_from_knowledge_array(cll, all_actions: int) -> int:
"""
knowledge_array = {i: 0.0 for i in range(all_actions)}

cll.sort(key=lambda cl: cl.action)
cll.sort(key=lambda cl: cl.action if isinstance(cl.action, int) else -1)
Copy link
Copy Markdown
Member

@khozzy khozzy Nov 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What causes that error?
It's a hack, but does not solve the cause of the problem

Copy link
Copy Markdown
Contributor Author

@e-dzia e-dzia Nov 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It only happens when actions are None, but I don't know the cause of this.

Copy link
Copy Markdown
Contributor Author

@e-dzia e-dzia Nov 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

screenshot 2018-11-10 18-26-42
Even with this hack, there are sometimes other errors caused by action being None, so I guess this hack doesn't even solve the error.


for _action, _clss in groupby(cll, lambda cl: cl.action):
_classifiers = [cl for cl in _clss]
Expand Down