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

Big/small tall/short modification #894

Merged
merged 30 commits into from
Aug 13, 2020
Merged

Big/small tall/short modification #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
bfaa041
passing unit tests for big/small/short/tall
paynesa Jul 9, 2020
efb84aa
biggest axis determination
paynesa Jul 9, 2020
20402a7
relative size perception
paynesa Jul 9, 2020
878ad04
fix small error
paynesa Jul 9, 2020
6374323
add relations and attributes to perception and test
paynesa Jul 9, 2020
812d31d
update relation learning
paynesa Jul 9, 2020
c7b2874
chinese language generator is updated
paynesa Jul 9, 2020
ce06d67
update complete; todo = test learning
paynesa Jul 10, 2020
0f7683a
fix learning tests
paynesa Jul 10, 2020
0eaac0e
Merge branch 'master' into learn-imprecise-description
paynesa Jul 16, 2020
ae66a97
rebase
paynesa Jul 16, 2020
6cdeb46
update comment removal
paynesa Jul 16, 2020
773ad28
remove unused args
paynesa Jul 17, 2020
1c9e801
remove more unused arguments
paynesa Jul 17, 2020
cb1447f
added special edge type
denizbeser Aug 6, 2020
46dcfb4
add gaze to curricula
paynesa Aug 10, 2020
046f42d
skip a few tests temporarily to rebase and pass CI
paynesa Aug 10, 2020
5395ba4
Merge branch 'master' into learn-imprecise-description
paynesa Aug 10, 2020
5e3f299
fix imports to pass pylint
paynesa Aug 10, 2020
947d8c2
issue found; temporary hackish fix to do with ordering of gaze vs. no…
paynesa Aug 10, 2020
1bd6893
sort from low to high graph complexity when matching candidate object…
paynesa Aug 10, 2020
0a93dce
remove print/debug statements
paynesa Aug 10, 2020
94387c4
add back in verb learner to integrated learner
paynesa Aug 10, 2020
2f89445
add back in verb learner to integrated learner
paynesa Aug 10, 2020
3627eb2
add bool flag so that only sort in object recognizer rather than obje…
paynesa Aug 10, 2020
9e191c6
update perception tests based on new edge implemented by Deniz
paynesa Aug 10, 2020
4ba80aa
remove debug and commented code
paynesa Aug 13, 2020
22aa52e
kwargs 1
paynesa Aug 13, 2020
02fc988
kwargs 2
paynesa Aug 13, 2020
460a2ad
re-enable relative-to-learner size
paynesa Aug 13, 2020
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
3 changes: 3 additions & 0 deletions adam/curriculum/attribute_constraining_action_curriculum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def make_human_eat_curriculum(
max_to_sample=num_samples if num_samples else 5,
ontology=GAILA_PHASE_1_ONTOLOGY,
chooser=PHASE1_CHOOSER_FACTORY(),
block_multiple_of_the_same_type=True,
),
language_generator=language_generator,
)
Expand All @@ -69,6 +70,7 @@ def make_animal_eat_curriculum(
max_to_sample=num_samples if num_samples else 5,
ontology=GAILA_PHASE_1_ONTOLOGY,
chooser=PHASE1_CHOOSER_FACTORY(),
block_multiple_of_the_same_type=True,
),
language_generator=language_generator,
)
Expand Down Expand Up @@ -100,6 +102,7 @@ def make_german_eat_test_curriculum(
max_to_sample=num_samples if num_samples else 5,
ontology=GAILA_PHASE_1_ONTOLOGY,
chooser=PHASE1_CHOOSER_FACTORY(),
block_multiple_of_the_same_type=True,
)
]
),
Expand Down
Loading