Release version 2.0.0

#81

PiperOrigin-RevId: 490966899
Change-Id: I7600da4f421ae3385829cc96403ce4824140dcce

CHANGELOG.md

@@ -6,6 +6,26 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [2.0.0] - 2022-11-25
+
+Melting Pot Version 2.0.0 release. See
+[Melting Pot 2.0 Tech Report](https://storage.googleapis.com/dm-meltingpot/meltingpot-tech-report-2.0.0.pdf)
+for detailed information on the new substrates, bots, and scenarios.
+
+### Changed
+
+- Removed all v1 scenarios, bots, and substrates and replaced with new versions.
+- Scenarios now support heterogenous roles, which must be specified at build
+  time.
+- Various improvements to `examples` and their documentation.
+
+### Added
+
+- New puppeteers and policies to implement new bots.
+- New utils to handle sprites, colors, and maps.
+- Mocks for use in testing.
+
+
 ## [1.0.4] - 2022-08-22
 
 ### Changed

install.sh

@@ -87,7 +87,7 @@ function test_dmlab2d() {
 
 function install_meltingpot() {
   echo -e "\nDownloading assets..."
-  curl -L https://storage.googleapis.com/dm-meltingpot/meltingpot-assets-1.0.0.tar.gz \
+  curl -L https://storage.googleapis.com/dm-meltingpot/meltingpot-assets-2.0.0.tar.gz \
       | tar -xz --directory=meltingpot
 
   echo -e "\nInstalling meltingpot..."
@@ -99,7 +99,7 @@ function install_meltingpot() {
 function test_meltingpot() {
   echo -e "\nTesting meltingpot..."
   pip install pytest-xdist
-  pytest -n auto -ra --durations=10 meltingpot
+  pytest -n auto -rax --durations=10 meltingpot
 }
 
 

meltingpot/lua/levels/allelopathic_harvest/components.lua

@@ -1,4 +1,4 @@
---[[ Copyright 2020 DeepMind Technologies Limited.
+--[[ Copyright 2022 DeepMind Technologies Limited.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -226,6 +226,7 @@ function Regrowth:__init__(kwargs)
   self._config.baseRate = kwargs.baseRate
   self._config.cubicRate = kwargs.cubicRate
   self._config.linearGrowth = kwargs.linearGrowth
+  self:resetCountdown()
 end
 
 function Regrowth:onStateChange(previousState)
@@ -552,7 +553,7 @@ function ColorZapper:addHits(worldConfig)
         layer = self._config.layerNames[idx],
         sprite = self._config.spriteNames[idx],
     }
-    table.insert(worldConfig.renderOrder, self._config.layerNames[idx])
+    component.insertIfNotPresent(worldConfig.renderOrder, self._config.layerNames[idx])
   end
 end
 

meltingpot/lua/levels/allelopathic_harvest/init.lua

@@ -1,4 +1,4 @@
---[[ Copyright 2020 DeepMind Technologies Limited.
+--[[ Copyright 2022 DeepMind Technologies Limited.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ]]
 
--- Entry point lua file for the allelopathic_harvest level.
+-- Entry point lua file for the allelopathic_harvest substrate.
 
 local meltingpot = 'meltingpot.lua.modules.'
 local api_factory = require(meltingpot .. 'api_factory')
 local simulation = require(meltingpot .. 'base_simulation')
 
--- Required to be able to use the components in the level
+-- Required to be able to use the components in the substrate
 local component_library = require(meltingpot .. 'component_library')
 local avatar_library = require(meltingpot .. 'avatar_library')
 local components = require 'components'