Rider suggested cleanup, part 1 (#5265)

Author: Chris Elion

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

@@ -1,7 +1,6 @@
 using UnityEngine;
 using Unity.MLAgents;
 using Unity.MLAgents.Actuators;
-using Unity.MLAgents.Sensors;
 using Unity.MLAgents.Sensors.Reflection;
 
 public class Ball3DHardAgent : Agent

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

@@ -31,7 +31,7 @@ public override ActionSpec ActionSpec
     /// <summary>
     /// Simple actuator that converts the action into a {-1, 0, 1} direction
     /// </summary>
-    public class BasicActuator : IActuator, IHeuristicProvider
+    public class BasicActuator : IActuator
     {
         public BasicController basicController;
         ActionSpec m_ActionSpec;

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

@@ -1,6 +1,5 @@
 using UnityEngine;
 using Unity.MLAgents;
-using Unity.Barracuda;
 using Unity.MLAgents.Actuators;
 using Unity.MLAgentsExamples;
 using Unity.MLAgents.Sensors;

Project/Assets/ML-Agents/Examples/DungeonEscape/Scripts/PushAgentEscape.cs

@@ -1,4 +1,3 @@
-using System.Collections;
 using UnityEngine;
 using Unity.MLAgents;
 using Unity.MLAgents.Sensors;

Project/Assets/ML-Agents/Examples/DungeonEscape/Scripts/SimpleNPC.cs

@@ -1,6 +1,3 @@
-// using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 public class SimpleNPC : MonoBehaviour

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

@@ -105,7 +105,7 @@ public void MoveAgent(ActionBuffers actionBuffers)
             dirToGo += transform.right * right;
             rotateDir = -transform.up * rotate;
 
-            var shootCommand = (int)discreteActions[0] > 0;
+            var shootCommand = discreteActions[0] > 0;
             if (shootCommand)
             {
                 m_Shoot = true;

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

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

Project/Assets/ML-Agents/Examples/PushBlock/Scripts/GoalDetectTrigger.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;
 

Project/Assets/ML-Agents/Examples/PushBlock/Scripts/PushAgentCollab.cs

@@ -1,6 +1,4 @@
 //Put this script on your blue cube.
-
-using System.Collections;
 using UnityEngine;
 using Unity.MLAgents;
 using Unity.MLAgents.Actuators;

Project/Assets/ML-Agents/Examples/PushBlockWithInput/Scripts/PushBlockWithInputAgentBasic.cs

@@ -1,6 +1,4 @@
 //Put this script on your blue cube.
-
-using System;
 using System.Collections;
 using UnityEngine;
 using Unity.MLAgents;
@@ -18,7 +16,7 @@ public class PushBlockWithInputAgentBasic : Agent
 
     /// <summary>
     /// The area bounds.
-    /// </summary'PushAgentBasic'>
+    /// </summary>
     [HideInInspector]
     public Bounds areaBounds;
 

Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/CollisionCallbacks.cs

@@ -1,6 +1,4 @@
 using UnityEngine;
-using Random = UnityEngine.Random;
-using Unity.MLAgents;
 using UnityEngine.Events;
 
 namespace Unity.MLAgentsExamples

Project/Assets/ML-Agents/Examples/Soccer/Scripts/SoccerEnvController.cs

@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Collections.Generic;
 using Unity.MLAgents;
 using UnityEngine;
@@ -91,7 +90,7 @@ public void ResetBall()
         var randomPosX = Random.Range(-2.5f, 2.5f);
         var randomPosZ = Random.Range(-2.5f, 2.5f);
 
-        ball.transform.position = m_BallStartingPos + new Vector3(randomPosX, 0f, randomPosZ); ;
+        ball.transform.position = m_BallStartingPos + new Vector3(randomPosX, 0f, randomPosZ);
         ballRb.velocity = Vector3.zero;
         ballRb.angularVelocity = Vector3.zero;
 

Project/Assets/ML-Agents/Examples/Sorter/Scripts/NumberTile.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 public class NumberTile : MonoBehaviour
@@ -8,7 +6,7 @@ public class NumberTile : MonoBehaviour
     public Material DefaultMaterial;
     public Material SuccessMaterial;
 
-    private bool m_Visited = false;
+    private bool m_Visited;
     private MeshRenderer m_Renderer;
 
     public bool IsVisited

Project/Assets/ML-Agents/Examples/Sorter/Scripts/SorterAgent.cs

@@ -81,7 +81,7 @@ public override void CollectObservations(VectorSensor sensor)
             // Here, the observation for the tile is added to the BufferSensor
             m_BufferSensor.AppendObservation(listObservation);
 
-        };
+        }
 
     }
 

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

@@ -261,7 +261,6 @@ void FixedUpdate()
     Vector3 GetAvgVelocity()
     {
         Vector3 velSum = Vector3.zero;
-        Vector3 avgVel = Vector3.zero;
 
         //ALL RBS
         int numOfRb = 0;
@@ -271,7 +270,7 @@ Vector3 GetAvgVelocity()
             velSum += item.rb.velocity;
         }
 
-        avgVel = velSum / numOfRb;
+        var avgVel = velSum / numOfRb;
         return avgVel;
     }
 

Project/Assets/ML-Agents/Examples/Worm/Scripts/WormAgent.cs

@@ -1,6 +1,5 @@
 using UnityEngine;
 using Unity.MLAgents;
-using Unity.Barracuda;
 using Unity.MLAgents.Actuators;
 using Unity.MLAgentsExamples;
 using Unity.MLAgents.Sensors;

com.unity.ml-agents.extensions/Runtime/Input/Adaptors/ButtonInputActionAdaptor.cs

@@ -1,6 +1,5 @@
 #if MLA_INPUT_SYSTEM
 using Unity.MLAgents.Actuators;
-using UnityEngine;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Controls;
 using UnityEngine.InputSystem.LowLevel;

com.unity.ml-agents.extensions/Runtime/Input/Adaptors/Vector2InputActionAdaptor.cs

@@ -1,9 +1,7 @@
 #if MLA_INPUT_SYSTEM
-using System;
 using Unity.MLAgents.Actuators;
 using UnityEngine;
 using UnityEngine.InputSystem;
-using UnityEngine.InputSystem.Controls;
 using UnityEngine.InputSystem.LowLevel;
 
 namespace Unity.MLAgents.Extensions.Input

com.unity.ml-agents.extensions/Runtime/Input/IRLActionInputAdaptor.cs

@@ -1,5 +1,4 @@
 #if MLA_INPUT_SYSTEM
-using System;
 using Unity.MLAgents.Actuators;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.LowLevel;

com.unity.ml-agents.extensions/Runtime/Input/InputActionActuator.cs

@@ -2,7 +2,6 @@
 
 using Unity.MLAgents.Actuators;
 using Unity.MLAgents.Policies;
-using UnityEngine;
 using UnityEngine.InputSystem;
 using UnityEngine.Profiling;
 

com.unity.ml-agents.extensions/Tests/Runtime/Input/Adaptors/IntegerInputActionAdaptorTests.cs

@@ -1,9 +1,7 @@
 #if MLA_INPUT_TESTS
-using System;
 using NUnit.Framework;
 using Unity.MLAgents.Actuators;
 using Unity.MLAgents.Extensions.Input;
-using UnityEngine;
 using UnityEngine.InputSystem;
 
 namespace Unity.MLAgents.Extensions.Tests.Runtime.Input

com.unity.ml-agents.extensions/Tests/Runtime/Sensors/CountingGridSensorTests.cs

@@ -133,7 +133,7 @@ public void TestCountingSensor()
 
             gridSensor.Update();
 
-            subarrayIndicies = new int[] { 77, 78, 87, 88 };
+            subarrayIndicies = new[] { 77, 78, 87, 88 };
             expectedSubarrays = DuplicateArray(new float[] { 2, 0 }, 4);
             expectedDefault = new float[] { 0, 0 };
             AssertSubarraysAtIndex(gridSensor.PerceptionBuffer, subarrayIndicies, expectedSubarrays, expectedDefault);

com.unity.ml-agents.extensions/Tests/Runtime/Sensors/RigidBodySensorTests.cs

@@ -1,4 +1,3 @@
-using System.Runtime.CompilerServices;
 using UnityEngine;
 using NUnit.Framework;
 using Unity.MLAgents.Sensors;

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

@@ -2,8 +2,6 @@
 using System.Text;
 using UnityEditor;
 using Unity.MLAgents.Demonstrations;
-using Unity.MLAgents.Policies;
-
 
 namespace Unity.MLAgents.Editor
 {

com.unity.ml-agents/Runtime/Actuators/ActionSpec.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 

com.unity.ml-agents/Runtime/Actuators/ActuatorComponent.cs

@@ -1,4 +1,3 @@
-using System;
 using UnityEngine;
 
 namespace Unity.MLAgents.Actuators

com.unity.ml-agents/Runtime/Actuators/IDiscreteActionMask.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Unity.MLAgents.Actuators
 {
     /// <summary>

com.unity.ml-agents/Runtime/Analytics/InferenceAnalytics.cs

@@ -31,7 +31,7 @@ internal class InferenceAnalytics
         /// <summary>
         /// Whether or not we've registered this particular event yet
         /// </summary>
-        static bool s_EventRegistered = false;
+        static bool s_EventRegistered;
 
         /// <summary>
         /// Hourly limit for this event name

com.unity.ml-agents/Runtime/Analytics/TrainingAnalytics.cs

@@ -47,7 +47,7 @@ internal static class TrainingAnalytics
         /// <summary>
         /// Whether or not we've registered this particular event yet
         /// </summary>
-        static bool s_EventsRegistered = false;
+        static bool s_EventsRegistered;
 
         /// <summary>
         /// Behaviors that we've already sent events for.

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

@@ -24,7 +24,7 @@ internal static class GrpcExtensions
         /// <summary>
         /// Static flag to make sure that we only fire the warning once.
         /// </summary>
-        private static bool s_HaveWarnedTrainerCapabilitiesAgentGroup = false;
+        private static bool s_HaveWarnedTrainerCapabilitiesAgentGroup;
 
         /// <summary>
         /// Converts a AgentInfo to a protobuf generated AgentInfoActionPairProto
@@ -326,8 +326,8 @@ public static ActionBuffers ToActionBuffers(this AgentActionProto proto)
         /// <summary>
         /// Static flag to make sure that we only fire the warning once.
         /// </summary>
-        private static bool s_HaveWarnedTrainerCapabilitiesMultiPng = false;
-        private static bool s_HaveWarnedTrainerCapabilitiesMapping = false;
+        private static bool s_HaveWarnedTrainerCapabilitiesMultiPng;
+        private static bool s_HaveWarnedTrainerCapabilitiesMapping;
 
         /// <summary>
         /// Generate an ObservationProto for the sensor using the provided ObservationWriter.

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

@@ -14,7 +14,7 @@ namespace Unity.MLAgents
     ///
     /// The DecisionRequester component provides a convenient and flexible way to
     /// trigger the agent decision making process. Without a DecisionRequester,
-    /// your <see cref="Agent"/> implmentation must manually call its
+    /// your <see cref="Agent"/> implementation must manually call its
     /// <seealso cref="Agent.RequestDecision"/> function.
     /// </remarks>
     [AddComponentMenu("ML Agents/Decision Requester", (int)MenuGroup.Default)]

com.unity.ml-agents/Runtime/Inference/BarracudaModelExtensions.cs

@@ -226,8 +226,7 @@ public static bool HasDiscreteOutputs(this Model model)
             }
             else
             {
-                return model.outputs.Contains(TensorNames.DiscreteActionOutput) &&
-                    (int)model.DiscreteOutputSize() > 0;
+                return model.outputs.Contains(TensorNames.DiscreteActionOutput) && model.DiscreteOutputSize() > 0;
             }
         }
 

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

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System;
-using UnityEngine;
 using Unity.Barracuda;
 using Unity.MLAgents.Inference.Utils;
 using Unity.MLAgents.Sensors;

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

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using Unity.Barracuda;
 using UnityEngine.Profiling;

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

@@ -29,9 +29,9 @@ public InplaceArray(T elem0)
         {
             m_Length = 1;
             m_Elem0 = elem0;
-            m_Elem1 = new T { };
-            m_Elem2 = new T { };
-            m_Elem3 = new T { };
+            m_Elem1 = new T();
+            m_Elem2 = new T();
+            m_Elem3 = new T();
         }
 
         /// <summary>
@@ -44,8 +44,8 @@ public InplaceArray(T elem0, T elem1)
             m_Length = 2;
             m_Elem0 = elem0;
             m_Elem1 = elem1;
-            m_Elem2 = new T { };
-            m_Elem3 = new T { };
+            m_Elem2 = new T();
+            m_Elem3 = new T();
         }
 
         /// <summary>
@@ -60,7 +60,7 @@ public InplaceArray(T elem0, T elem1, T elem2)
             m_Elem0 = elem0;
             m_Elem1 = elem1;
             m_Elem2 = elem2;
-            m_Elem3 = new T { };
+            m_Elem3 = new T();
         }
 
         /// <summary>

com.unity.ml-agents/Runtime/Integrations/Match3/Move.cs

@@ -75,7 +75,7 @@ public static Move FromMoveIndex(int moveIndex, BoardSize maxBoardSize)
 
             if (moveIndex < 0 || moveIndex >= NumPotentialMoves(maxBoardSize))
             {
-                throw new ArgumentOutOfRangeException("Invalid move index.");
+                throw new ArgumentOutOfRangeException("moveIndex");
             }
             Direction dir;
             int row, col;

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

@@ -1,8 +1,9 @@
 using System;
-using System.Linq;
 using UnityEngine;
 #if UNITY_EDITOR
 using UnityEditor;
+#else
+using System.Linq;
 #endif
 
 namespace Unity.MLAgents

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

@@ -7,7 +7,7 @@ internal static class MultiAgentGroupIdCounter
         static int s_Counter;
         public static int GetGroupId()
         {
-            return Interlocked.Increment(ref s_Counter); ;
+            return Interlocked.Increment(ref s_Counter);
         }
     }
 }

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

@@ -22,7 +22,6 @@ internal class HeuristicPolicy : IPolicy
         NullList m_NullList = new NullList();
 
 
-        /// <inheritdoc />
         public HeuristicPolicy(ActuatorManager actuatorManager, ActionSpec actionSpec)
         {
             m_ActuatorManager = actuatorManager;

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

@@ -26,7 +26,6 @@ internal class RemotePolicy : IPolicy
         /// </summary>
         private IList<IActuator> m_Actuators;
 
-        /// <inheritdoc />
         public RemotePolicy(
             ActionSpec actionSpec,
             IList<IActuator> actuators,

com.unity.ml-agents/Runtime/Sensors/BoxOverlapChecker.cs

@@ -83,7 +83,7 @@ void InitCellLocalPositions()
 
         /// <summary>Converts the index of the cell to the 3D point (y is zero) relative to grid center</summary>
         /// <returns>Vector3 of the position of the center of the cell relative to grid center</returns>
-        /// <param name="cell">The index of the cell</param>
+        /// <param name="cellIndex">The index of the cell</param>
         Vector3 GetCellLocalPosition(int cellIndex)
         {
             float x = (cellIndex / m_GridSize.z - m_CellCenterOffset.x) * m_CellScale.x;

com.unity.ml-agents/Runtime/Sensors/GridSensorComponent.cs

@@ -4,7 +4,7 @@
 namespace Unity.MLAgents.Sensors
 {
     /// <summary>
-    /// A SensorComponent that creates a <see cref="GridSensor"/>.
+    /// A SensorComponent that creates a <see cref="GridSensorBase"/>.
     /// </summary>
     [AddComponentMenu("ML Agents/Grid Sensor", (int)MenuGroup.Sensors)]
     public class GridSensorComponent : SensorComponent