Reintroduce MLAgents.Sensors namespace

Project/Assets/ML-Agents/Examples/3DBall/Scripts/Ball3DAgent.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using MLAgents;
+using MLAgents.Sensors;
 
 public class Ball3DAgent : Agent
 {

Project/Assets/ML-Agents/Examples/3DBall/Scripts/Ball3DHardAgent.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using MLAgents;
+using MLAgents.Sensors;
 
 public class Ball3DHardAgent : Agent
 {

Project/Assets/ML-Agents/Examples/Basic/Scripts/BasicAgent.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using MLAgents;
+using MLAgents.Sensors;
 
 public class BasicAgent : Agent
 {

Project/Assets/ML-Agents/Examples/Bouncer/Scripts/BouncerAgent.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using MLAgents;
+using MLAgents.Sensors;
 
 public class BouncerAgent : Agent
 {

Project/Assets/ML-Agents/Examples/Crawler/Scripts/CrawlerAgent.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 using MLAgents;
 using MLAgentsExamples;
+using MLAgents.Sensors;
 
 [RequireComponent(typeof(JointDriveController))] // Required to set joint forces
 public class CrawlerAgent : Agent

Project/Assets/ML-Agents/Examples/FoodCollector/Scripts/FoodCollectorAgent.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using MLAgents;
+using MLAgents.Sensors;
 
 public class FoodCollectorAgent : Agent
 {

Project/Assets/ML-Agents/Examples/GridWorld/Scripts/GridAgent.cs

@@ -2,6 +2,7 @@
 using UnityEngine;
 using System.Linq;
 using MLAgents;
+using MLAgents.Sensors;
 using UnityEngine.Serialization;
 
 public class GridAgent : Agent

Project/Assets/ML-Agents/Examples/Hallway/Scripts/HallwayAgent.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using UnityEngine;
 using MLAgents;
+using MLAgents.Sensors;
 
 public class HallwayAgent : Agent
 {

Project/Assets/ML-Agents/Examples/Pyramids/Scripts/PyramidAgent.cs

@@ -3,6 +3,7 @@
 using UnityEngine;
 using Random = UnityEngine.Random;
 using MLAgents;
+using MLAgents.Sensors;
 
 public class PyramidAgent : Agent
 {

Project/Assets/ML-Agents/Examples/Reacher/Scripts/ReacherAgent.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using MLAgents;
+using MLAgents.Sensors;
 
 public class ReacherAgent : Agent
 {

Project/Assets/ML-Agents/Examples/Template/Scripts/TemplateAgent.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using MLAgents;
+using MLAgents.Sensors;
 
 public class TemplateAgent : Agent
 {

Project/Assets/ML-Agents/Examples/Tennis/Scripts/TennisAgent.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 using MLAgents;
+using MLAgents.Sensors;
 
 public class TennisAgent : Agent
 {

Project/Assets/ML-Agents/Examples/Walker/Scripts/WalkerAgent.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 using MLAgents;
 using MLAgentsExamples;
+using MLAgents.Sensors;
 
 public class WalkerAgent : Agent
 {

Project/Assets/ML-Agents/Examples/WallJump/Scripts/WallJumpAgent.cs

@@ -4,7 +4,7 @@
 using UnityEngine;
 using MLAgents;
 using Barracuda;
-
+using MLAgents.Sensors;
 
 public class WallJumpAgent : Agent
 {

com.unity.ml-agents/CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  - Beta support for ONNX export was added. If the `tf2onnx` python package is installed, models will be saved to `.onnx` as well as `.nn` format.
  Note that Barracuda 0.6.0 or later is required to import the `.onnx` files properly
  - Multi-GPU training and the `--multi-gpu` option has been removed temporarily. (#3345)
+ - All Sensor related code has been moved to the namespace `MLAgents.Sensors`.
 
 ### Minor Changes
  - Monitor.cs was moved to Examples. (#3372)

com.unity.ml-agents/Editor/BehaviorParametersEditor.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using MLAgents.Sensors;
 using UnityEditor;
 using Barracuda;
 

com.unity.ml-agents/Editor/RayPerceptionSensorComponentBaseEditor.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 using UnityEditor;
-using Barracuda;
+using MLAgents.Sensors;
 
 namespace MLAgents
 {

com.unity.ml-agents/Runtime/Agent.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using Barracuda;
+using MLAgents.Sensors;
 
 namespace MLAgents
 {

com.unity.ml-agents/Runtime/Communicator/GrpcExtensions.cs

@@ -5,6 +5,7 @@
 using MLAgents.CommunicatorObjects;
 using UnityEngine;
 using System.Runtime.CompilerServices;
+using MLAgents.Sensors;
 
 [assembly: InternalsVisibleTo("Unity.ML-Agents.Editor")]
 [assembly: InternalsVisibleTo("Unity.ML-Agents.Editor.Tests")]

com.unity.ml-agents/Runtime/Communicator/ICommunicator.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using MLAgents.Sensors;
 
 namespace MLAgents
 {

com.unity.ml-agents/Runtime/Communicator/RpcCommunicator.cs

@@ -9,6 +9,7 @@
 using System.Linq;
 using UnityEngine;
 using MLAgents.CommunicatorObjects;
+using MLAgents.Sensors;
 using System.IO;
 using Google.Protobuf;
 

com.unity.ml-agents/Runtime/Demonstrations/DemonstrationWriter.cs

@@ -1,6 +1,7 @@
 using System.IO;
 using Google.Protobuf;
 using System.Collections.Generic;
+using MLAgents.Sensors;
 
 namespace MLAgents
 {

com.unity.ml-agents/Runtime/InferenceBrain/BarracudaModelParamLoader.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Barracuda;
-using UnityEngine;
+using MLAgents.Sensors;
 
 namespace MLAgents.InferenceBrain
 {

com.unity.ml-agents/Runtime/InferenceBrain/GeneratorImpl.cs

@@ -3,6 +3,7 @@
 using Barracuda;
 using MLAgents.InferenceBrain.Utils;
 using UnityEngine;
+using MLAgents.Sensors;
 
 namespace MLAgents.InferenceBrain
 {

com.unity.ml-agents/Runtime/InferenceBrain/ModelRunner.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Barracuda;
 using UnityEngine.Profiling;
-using System;
+using MLAgents.Sensors;
 
 namespace MLAgents.InferenceBrain
 {

com.unity.ml-agents/Runtime/InferenceBrain/TensorGenerator.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Barracuda;
+using MLAgents.Sensors;
 
 namespace MLAgents.InferenceBrain
 {

com.unity.ml-agents/Runtime/Policy/BarracudaPolicy.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using MLAgents.InferenceBrain;
 using System;
+using MLAgents.Sensors;
 
 namespace MLAgents
 {

com.unity.ml-agents/Runtime/Policy/HeuristicPolicy.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System;
+using MLAgents.Sensors;
 
 namespace MLAgents
 {

com.unity.ml-agents/Runtime/Policy/IPolicy.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using MLAgents.Sensors;
 
 namespace MLAgents
 {

com.unity.ml-agents/Runtime/Policy/RemotePolicy.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 using System.Collections.Generic;
 using System;
+using MLAgents.Sensors;
 
 namespace MLAgents
 {

com.unity.ml-agents/Runtime/Sensor/CameraSensor.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// A sensor that wraps a Camera object to generate visual observations for an agent.

com.unity.ml-agents/Runtime/Sensor/CameraSensorComponent.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// A SensorComponent that creates a <see cref="CameraSensor"/>.

com.unity.ml-agents/Runtime/Sensor/ISensor.cs

@@ -1,4 +1,4 @@
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// The compression setting for visual/camera observations.

com.unity.ml-agents/Runtime/Sensor/Observation.cs

@@ -1,7 +1,6 @@
 using System;
-using UnityEngine;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     internal struct Observation
     {

com.unity.ml-agents/Runtime/Sensor/RayPerceptionSensor.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// Determines which dimensions the sensor will perform the casts in.

com.unity.ml-agents/Runtime/Sensor/RayPerceptionSensorComponent2D.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// A component for 2D Ray Perception.

com.unity.ml-agents/Runtime/Sensor/RayPerceptionSensorComponent3D.cs

@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.Serialization;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// A component for 3D Ray Perception.

com.unity.ml-agents/Runtime/Sensor/RayPerceptionSensorComponentBase.cs

@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.Serialization;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// A base class to support sensor components for raycast-based sensors.

com.unity.ml-agents/Runtime/Sensor/RenderTextureSensor.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// Sensor class that wraps a <see cref="RenderTexture"/> instance.

com.unity.ml-agents/Runtime/Sensor/RenderTextureSensorComponent.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// Component that wraps a <see cref="RenderTextureSensor"/>.

com.unity.ml-agents/Runtime/Sensor/SensorBase.cs

@@ -1,4 +1,4 @@
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// A base sensor that provides a number default implementations.

com.unity.ml-agents/Runtime/Sensor/SensorComponent.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// Editor components for creating Sensors. Generally an ISensor implementation should have a

com.unity.ml-agents/Runtime/Sensor/SensorShapeValidator.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     internal class SensorShapeValidator
     {

com.unity.ml-agents/Runtime/Sensor/StackingSensor.cs

@@ -1,4 +1,4 @@
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// Sensor that wraps around another Sensor to provide temporal stacking.

com.unity.ml-agents/Runtime/Sensor/VectorSensor.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// A sensor implementation for vector observations.

com.unity.ml-agents/Runtime/Sensor/WriteAdapter.cs

@@ -3,7 +3,7 @@
 using Barracuda;
 using MLAgents.InferenceBrain;
 
-namespace MLAgents
+namespace MLAgents.Sensors
 {
     /// <summary>
     /// Allows sensors to write to both TensorProxy and float arrays/lists.

com.unity.ml-agents/Runtime/Utilities.cs

@@ -1,5 +1,6 @@
 using System;
 using UnityEngine;
+using MLAgents.Sensors;
 
 namespace MLAgents
 {

com.unity.ml-agents/Tests/Editor/DemonstrationTests.cs

@@ -3,6 +3,7 @@
 using System.IO.Abstractions.TestingHelpers;
 using System.Reflection;
 using MLAgents.CommunicatorObjects;
+using MLAgents.Sensors;
 
 namespace MLAgents.Tests
 {

com.unity.ml-agents/Tests/Editor/MLAgentsEditModeTest.cs

@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using System.Reflection;
 using System.Collections.Generic;
+using MLAgents.Sensors;
 
 namespace MLAgents.Tests
 {

com.unity.ml-agents/Tests/Editor/Sensor/FloatVisualSensorTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using UnityEngine;
+using MLAgents.Sensors;
 
 namespace MLAgents.Tests
 {

com.unity.ml-agents/Tests/Editor/Sensor/RayPerceptionSensorTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 using UnityEngine;
+using MLAgents.Sensors;
 
 namespace MLAgents.Tests
 {