Merge master into hybrid actions staging branch #4704
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* first pass - matching and gravity work * valid moves WIP * move enumeration, simple checking * move detection * fix up/down directions * actuator and heuristic * sensor * reset if no moves * add masking, retrain * cleanup * config update * optionally force heuristic mode * compressed observations, reset board if no moves * TFModel meta files * WIP abstract * random move heuristic * rename Move fields, migrate IsValid logic * comments * reduce dependency on Match3Agent * abstractBoard as monobehavior * move actuator to extensions * move sensor to extensions * update components in scene * undo accidental checkins * drawing cleanup, custom maxMoves logic * meta file * prefab, use 8 agents * different behaviors * timers, early out * unit tests * docs * Apply suggestions from code review Co-authored-by: Vincent-Pierre BERGES <[email protected]> * doc cleanup, swap to .nn file, add heuristic agents * board iterator * convert others to iterator, rename to Move.MoveIndex * change observation type to enum * fix flip for compressed obs * save dimensions on sensor * save dimension on actuator * Match3 example - special pieces (#4575) * WIP special pieces * add special piece types to obs (need more from master first) * update sensors and models * docstrings * more interesting scoring, smarter heuristic * more steps * longer trained models * handle no valid moves more gracefully (#4598) * handle no valid moves more gracefully * rename callback * cleanup heuristic logic * more sensor and actuator tests * update heuristic configs * docstrings and add to environment docs * sensor and actuator names * compare compressed obs against saved PNGs * review feedback, cleanup TODOs, comments * docstrings, heuristic benchmarks * kind of working * added symbol gameobjects * basic shapes & colors working * cleanup and added background * bug hunt. won't train * merge master version * update prefabs * update prefabs * add image to docs * Update Match3.md * rename some properties * remove unneeded comments and some cleanup Co-authored-by: Chris Elion <[email protected]> Co-authored-by: Vincent-Pierre BERGES <[email protected]>
* Update CONTRIBUTING.md Added note about env contributions * removed trailing space
…ile (#4630) * Update Training-ML-Agents.md * Update docs/Training-ML-Agents.md Co-authored-by: Ervin T. <[email protected]> * removed trailing whitespace Co-authored-by: Ervin T. <[email protected]>
* Change title * added overvierw, cleaned up structure. * Updated with getting started, clean up * added link to form. added note about playable * clean up * Update Match3.md
* use int64 steps * check for NaN actions Co-authored-by: Ruo-Ping Dong <[email protected]>
* Update Readme table and loose link to master * Remove ../.. and replace with release_10_docs
* use int64 steps * check for NaN actions Co-authored-by: Ruo-Ping Dong <[email protected]> Co-authored-by: Chris Elion <[email protected]>
* updated image in learning envs examples * add link to learning example to match-3 * cleaned up headings * removed anchor * Update Match3.md * Delete match3.png * added new match3 image * updated match3 image link
* Cherry-pick fix from #4659
…ing Match3 (#4664) * match3 settings * Add epsilon to log * Add another epsilon * Revert match3 configs * NaN-free masking method * Add comment for paper * Add comment for paper Co-authored-by: Chris Elion <[email protected]>
* match3 settings * Add epsilon to log * Add another epsilon * Revert match3 configs * NaN-free masking method * Add comment for paper * Add comment for paper Co-authored-by: Chris Elion <[email protected]> Co-authored-by: Chris Elion <[email protected]>
* [Bug-fix] Remove extra directory created at checkpoint * removing os import
* Remove extra period * Update changelog * Re add a period (#4676) * Adding a trailing period * formating Co-authored-by: Vincent-Pierre BERGES <[email protected]>
* Remove extra period * Update changelog * Re add a period (#4676) * Adding a trailing period * formating Co-authored-by: Vincent-Pierre BERGES <[email protected]> Co-authored-by: Vincent-Pierre BERGES <[email protected]>
Co-authored-by: Chris Elion <[email protected]>
Merging release 10 into master
* pin pip to 20.2 for now * add self to list of trigger files
chriselion
approved these changes
Dec 3, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed change(s)
This was non trivial due to the clipping changes. Also, there seems to be many Match 3 changes causing a large diff
Useful links (Github issues, JIRA tickets, ML-Agents forum threads etc.)
Types of change(s)
Checklist
Other comments