Unverified Commit de95b16d authored by Benjamin Beyret's avatar Benjamin Beyret Committed by GitHub
Browse files

Merge v1.1.1

V1.1.1
Hotfix curriculum loading in the wrong order
parents 2d5155da 267ce972
# Animal-AI Olympics
## IMPORTANT NOTICE ABOUT PRIZES
Please remember **to submit to the competition and be considered for prizes you must also fill in [this form](https://forms.gle/PKCgp2JAWvjf4c9i6)**. You must do so before the end of September 1st to be considered for the AWS prizes!
Please remember **to submit to the competition and be considered for prizes you must also fill in [this form](https://forms.gle/PKCgp2JAWvjf4c9i6)**. You must do so before the end of November 1st!
<p align="center">
<img height="300" src="documentation/PrefabsPictures/steampunkFOURcrop.png">
......@@ -19,7 +19,7 @@ The Animal-AI Olympics is an AI competition with tests inspired by animal cognit
* 3rd place overall: **$1,500**.
* WBA-Prize: **$5,000 total value** - $4,000 with up to $1,000 travel to speak at NeurIPS 2019
* Category Prizes: **$200** For best performance in each category (cannot combine with other prizes - max 1 per team).
* **Mid-way AWS Research Credits**: The top 20 entries as of **September 1st** will be awarded **$500** of AWS credits.
* ~~**Mid-way AWS Research Credits**: The top 20 entries as of **September 1st** will be awarded **$500** of AWS credits.~~ (already awarded)
See [competition launch page](https://mdcrosby.com/blog/animalailaunch.html) and official rules for further details.
......@@ -172,6 +172,9 @@ features with the agent's frames in order to have frames in line with the config
## Version History
- v1.1.1
- Hotfix curriculum loading in the wrong order
- v1.1.0
- Add curriculum learning to `animalai-train` to use yaml configurations
......
......@@ -2,7 +2,7 @@ from setuptools import setup
setup(
name='animalai',
version='1.1.0',
version='1.1.1',
description='Animal AI competition interface',
url='https://github.com/beyretb/AnimalAI-Olympics',
author='Benjamin Beyret',
......
......@@ -63,7 +63,7 @@ class Curriculum(object):
raise Curriculum(
'One or more configuration file(s) in curriculum {0} could not be found'.format(location)
)
self.configurations = [ArenaConfig(os.path.join(folder, file)) for file in yaml_files]
self.configurations = [ArenaConfig(os.path.join(folder, file)) for file in configuration_files]
@property
def lesson_num(self):
......@@ -92,9 +92,10 @@ class Curriculum(object):
# parameters = self.data['parameters']
# for key in parameters:
# config[key] = parameters[key][self.lesson_num]
logger.info('{0} lesson changed. Now in lesson {1}'
logger.info('{0} lesson changed. Now in lesson {1}: {2}'
.format(self._brain_name,
self.lesson_num))
self.lesson_num,
self.data['configuration_files'][self.lesson_num]))
return True
return False
......
......@@ -2,7 +2,7 @@ from setuptools import setup
setup(
name='animalai_train',
version='1.1.0',
version='1.1.1',
description='Animal AI competition training library',
url='https://github.com/beyretb/AnimalAI-Olympics',
author='Benjamin Beyret',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment