[MLA-1912] Move Match3 to com.unity.ml-agents (#5259)

Author: Chris Elion

Project/Assets/ML-Agents/Examples/Match3/Scripts/Match3Agent.cs

@@ -2,7 +2,7 @@
 using UnityEngine;
 using Unity.MLAgents;
 using Unity.MLAgents.Actuators;
-using Unity.MLAgents.Extensions.Match3;
+using Unity.MLAgents.Integrations.Match3;
 
 namespace Unity.MLAgentsExamples
 {

Project/Assets/ML-Agents/Examples/Match3/Scripts/Match3Board.cs

@@ -1,5 +1,5 @@
 using System;
-using Unity.MLAgents.Extensions.Match3;
+using Unity.MLAgents.Integrations.Match3;
 using UnityEngine;
 using UnityEngine.Serialization;
 

Project/Assets/ML-Agents/Examples/Match3/Scripts/Match3ExampleActuator.cs

@@ -1,5 +1,5 @@
 using Unity.MLAgents;
-using Unity.MLAgents.Extensions.Match3;
+using Unity.MLAgents.Integrations.Match3;
 
 namespace Unity.MLAgentsExamples
 {

Project/Assets/ML-Agents/Examples/Match3/Scripts/Match3ExampleActuatorComponent.cs

@@ -1,6 +1,6 @@
 using Unity.MLAgents;
 using Unity.MLAgents.Actuators;
-using Unity.MLAgents.Extensions.Match3;
+using Unity.MLAgents.Integrations.Match3;
 
 namespace Unity.MLAgentsExamples
 {

com.unity.ml-agents.extensions/Documentation~/com.unity.ml-agents.extensions.md

@@ -4,10 +4,10 @@
 using UnityEngine;
 using Debug = UnityEngine.Debug;
 
-namespace Unity.MLAgents.Extensions.Match3
+namespace Unity.MLAgents.Integrations.Match3
 {
     /// <summary>
-    /// Representation of the AbstractBoard size and number of cell and special types.
+    /// Representation of the AbstractBoard dimensions, and number of cell and special types.
     /// </summary>
     public struct BoardSize
     {
@@ -125,7 +125,7 @@ public virtual BoardSize GetCurrentBoardSize()
         public abstract bool IsMoveValid(Move m);
 
         /// <summary>
-        /// Instruct the game to make the given move. Returns true if the move was made.
+        /// Instruct the game to make the given Move. Returns true if the move was made.
         /// Note that during training, a move that was marked as invalid may occasionally still be
         /// requested. If this happens, it is safe to do nothing and request another move.
         /// </summary>

com.unity.ml-agents/CHANGELOG.md

@@ -2,7 +2,7 @@
 using Debug = UnityEngine.Debug;
 
 
-namespace Unity.MLAgents.Extensions.Match3
+namespace Unity.MLAgents.Integrations.Match3
 {
     /// <summary>
     /// Actuator for a Match3 game. It translates valid moves (defined by AbstractBoard.IsMoveValid())
@@ -23,7 +23,6 @@ public class Match3Actuator : IActuator, IBuiltInActuator
         /// <param name="forceHeuristic">Whether the inference action should be ignored and the Agent's Heuristic
         /// should be called. This should only be used for generating comparison stats of the Heuristic.</param>
         /// <param name="seed">The seed used to initialize <see cref="System.Random"/>.</param>
-        /// <param name="agent"></param>
         /// <param name="name"></param>
         public Match3Actuator(AbstractBoard board,
                               bool forceHeuristic,

com.unity.ml-agents/Documentation~/com.unity.ml-agents.md

@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.Serialization;
 
-namespace Unity.MLAgents.Extensions.Match3
+namespace Unity.MLAgents.Integrations.Match3
 {
     /// <summary>
     /// Actuator component for a Match3 game. Generates a Match3Actuator at runtime.

com.unity.ml-agents/Runtime/Integrations.meta

@@ -3,7 +3,7 @@
 using Unity.MLAgents.Sensors;
 using UnityEngine;
 
-namespace Unity.MLAgents.Extensions.Match3
+namespace Unity.MLAgents.Integrations.Match3
 {
     /// <summary>
     /// Delegate that provides integer values at a given (x,y) coordinate.
@@ -164,7 +164,6 @@ public int Write(ObservationWriter writer)
                 }
             }
 
-
             return offset;
         }
 

com.unity.ml-agents.extensions/Runtime/Match3.meta renamed to com.unity.ml-agents/Runtime/Integrations/Match3.meta

@@ -2,7 +2,7 @@
 using Unity.MLAgents.Sensors;
 using UnityEngine;
 
-namespace Unity.MLAgents.Extensions.Match3
+namespace Unity.MLAgents.Integrations.Match3
 {
     /// <summary>
     /// Sensor component for a Match3 game.

com.unity.ml-agents.extensions/Runtime/Match3/AbstractBoard.cs renamed to com.unity.ml-agents/Runtime/Integrations/Match3/AbstractBoard.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace Unity.MLAgents.Extensions.Match3
+namespace Unity.MLAgents.Integrations.Match3
 {
     /// <summary>
     /// Directions for a Move.
@@ -141,7 +141,7 @@ public void Next(BoardSize maxBoardSize)
         }
 
         /// <summary>
-        /// Construct a Move from the row, column, and direction.
+        /// Construct a Move from the row, column, direction, and board size.
         /// </summary>
         /// <param name="row"></param>
         /// <param name="col"></param>

com.unity.ml-agents.extensions/Runtime/Match3/AbstractBoard.cs.meta renamed to com.unity.ml-agents/Runtime/Integrations/Match3/AbstractBoard.cs.meta

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using UnityEngine;
 using NUnit.Framework;
-using Unity.MLAgents.Extensions.Match3;
+using Unity.MLAgents.Integrations.Match3;
 
-namespace Unity.MLAgents.Extensions.Tests.Match3
+namespace Unity.MLAgents.Tests.Integrations.Match3
 {
     internal class StringBoard : AbstractBoard
     {

com.unity.ml-agents.extensions/Runtime/Match3/Match3Actuator.cs renamed to com.unity.ml-agents/Runtime/Integrations/Match3/Match3Actuator.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 using Unity.MLAgents.Actuators;
-using Unity.MLAgents.Extensions.Match3;
+using Unity.MLAgents.Integrations.Match3;
 using UnityEngine;
 
-namespace Unity.MLAgents.Extensions.Tests.Match3
+namespace Unity.MLAgents.Tests.Integrations.Match3
 {
     internal class SimpleBoard : AbstractBoard
     {

com.unity.ml-agents.extensions/Runtime/Match3/Match3Actuator.cs.meta renamed to com.unity.ml-agents/Runtime/Integrations/Match3/Match3Actuator.cs.meta

@@ -2,12 +2,12 @@
 using System.IO;
 using System.Reflection;
 using NUnit.Framework;
-using Unity.MLAgents.Extensions.Match3;
 using UnityEngine;
-using Unity.MLAgents.Extensions.Tests.Sensors;
+using Unity.MLAgents.Integrations.Match3;
 using Unity.MLAgents.Sensors;
+using Unity.MLAgents.Tests;
 
-namespace Unity.MLAgents.Extensions.Tests.Match3
+namespace Unity.MLAgents.Tests.Integrations.Match3
 {
     public class Match3SensorTests
     {
@@ -373,7 +373,7 @@ void SavePNGs(byte[] concatenatedPngData, string pathPrefix)
             for (var i = 0; i < splitPngs.Count; i++)
             {
                 var pngData = splitPngs[i];
-                var path = $"Packages/com.unity.ml-agents.extensions/Tests/Editor/Match3/{pathPrefix}{i}.png";
+                var path = $"Packages/com.unity.ml-agents/Tests/Editor/Integrations/Match3/{pathPrefix}{i}.png";
                 using (var sw = File.Create(path))
                 {
                     foreach (var b in pngData)
@@ -389,7 +389,7 @@ byte[] LoadPNGs(string pathPrefix, int numExpected)
             var bytesOut = new List<byte>();
             for (var i = 0; i < numExpected; i++)
             {
-                var path = $"Packages/com.unity.ml-agents.extensions/Tests/Editor/Match3/{pathPrefix}{i}.png";
+                var path = $"Packages/com.unity.ml-agents/Tests/Editor/Integrations/Match3/{pathPrefix}{i}.png";
                 var res = File.ReadAllBytes(path);
                 bytesOut.AddRange(res);
             }

com.unity.ml-agents.extensions/Runtime/Match3/Match3ActuatorComponent.cs renamed to com.unity.ml-agents/Runtime/Integrations/Match3/Match3ActuatorComponent.cs

@@ -1,8 +1,8 @@
 using System;
 using NUnit.Framework;
-using Unity.MLAgents.Extensions.Match3;
+using Unity.MLAgents.Integrations.Match3;
 
-namespace Unity.MLAgents.Extensions.Tests.Match3
+namespace Unity.MLAgents.Tests.Integrations.Match3
 {
     public class MoveTests
     {

com.unity.ml-agents.extensions/Runtime/Match3/Match3ActuatorComponent.cs.meta renamed to com.unity.ml-agents/Runtime/Integrations/Match3/Match3ActuatorComponent.cs.meta

@@ -5,7 +5,8 @@
         "Unity.ML-Agents",
         "Unity.Barracuda",
         "Unity.ML-Agents.CommunicatorObjects",
-        "Unity.ML-Agents.Runtime.Utils.Tests"
+        "Unity.ML-Agents.Runtime.Utils.Tests",
+        "Unity.ML-Agents.Runtime.Sensor.Tests"
     ],
     "optionalUnityReferences": [
         "TestAssemblies"