Moving the max step logic

Project/Assets/ML-Agents/Examples/FoodCollector/Prefabs/FoodCollectorArea.prefab

@@ -2187,7 +2187,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: FoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114176228333253036
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2436,6 +2436,7 @@ GameObject:
   - component: {fileID: 114522573150607728}
   - component: {fileID: 114711827726849508}
   - component: {fileID: 114443152683847924}
+  - component: {fileID: 259154752087955944}
   m_Layer: 0
   m_Name: Agent (1)
   m_TagString: agent
@@ -2511,7 +2512,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: FoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114711827726849508
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2524,7 +2525,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c66e6845309d241c78a6d77ee2567928, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxStep: 0
+  maxStep: 5000
   area: {fileID: 1819751139121548}
   turnSpeed: 300
   moveSpeed: 2
@@ -2567,6 +2568,21 @@ MonoBehaviour:
   useWorldPositions: 1
   startVerticalOffset: 0
   endVerticalOffset: 0
+--- !u!114 &259154752087955944
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1495617568563208}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DecisionPeriod: 5
+  RepeatAction: 1
+  offsetStep: 0
 --- !u!1 &1528397385587768
 GameObject:
   m_ObjectHideFlags: 0
@@ -2749,6 +2765,7 @@ GameObject:
   - component: {fileID: 114980787530065684}
   - component: {fileID: 114542632553128056}
   - component: {fileID: 114986980423924774}
+  - component: {fileID: 5519119940433428255}
   m_Layer: 0
   m_Name: Agent (2)
   m_TagString: agent
@@ -2824,7 +2841,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: FoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114542632553128056
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2837,7 +2854,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c66e6845309d241c78a6d77ee2567928, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxStep: 0
+  maxStep: 5000
   area: {fileID: 1819751139121548}
   turnSpeed: 300
   moveSpeed: 2
@@ -2880,6 +2897,21 @@ MonoBehaviour:
   useWorldPositions: 1
   startVerticalOffset: 0
   endVerticalOffset: 0
+--- !u!114 &5519119940433428255
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1601500200010266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DecisionPeriod: 5
+  RepeatAction: 1
+  offsetStep: 0
 --- !u!1 &1617924810425504
 GameObject:
   m_ObjectHideFlags: 0
@@ -3325,6 +3357,7 @@ GameObject:
   - component: {fileID: 114878550018296316}
   - component: {fileID: 114189751434580810}
   - component: {fileID: 114644889237473510}
+  - component: {fileID: 5884750436653390196}
   m_Layer: 0
   m_Name: Agent (4)
   m_TagString: agent
@@ -3400,7 +3433,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: FoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114189751434580810
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3413,7 +3446,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c66e6845309d241c78a6d77ee2567928, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxStep: 0
+  maxStep: 5000
   area: {fileID: 1819751139121548}
   turnSpeed: 300
   moveSpeed: 2
@@ -3456,6 +3489,21 @@ MonoBehaviour:
   useWorldPositions: 1
   startVerticalOffset: 0
   endVerticalOffset: 0
+--- !u!114 &5884750436653390196
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1672905243433088}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DecisionPeriod: 5
+  RepeatAction: 1
+  offsetStep: 0
 --- !u!1 &1688105343773098
 GameObject:
   m_ObjectHideFlags: 0
@@ -3624,6 +3672,7 @@ GameObject:
   - component: {fileID: 114035338027591536}
   - component: {fileID: 114235147148547996}
   - component: {fileID: 114276061479012222}
+  - component: {fileID: 4768752321433982785}
   m_Layer: 0
   m_Name: Agent (3)
   m_TagString: agent
@@ -3699,7 +3748,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: FoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114235147148547996
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3712,7 +3761,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c66e6845309d241c78a6d77ee2567928, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxStep: 0
+  maxStep: 5000
   area: {fileID: 1819751139121548}
   turnSpeed: 300
   moveSpeed: 2
@@ -3755,6 +3804,21 @@ MonoBehaviour:
   useWorldPositions: 1
   startVerticalOffset: 0
   endVerticalOffset: 0
+--- !u!114 &4768752321433982785
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1706274796045088}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DecisionPeriod: 5
+  RepeatAction: 1
+  offsetStep: 0
 --- !u!1 &1729825611722018
 GameObject:
   m_ObjectHideFlags: 0

Project/Assets/ML-Agents/Examples/FoodCollector/Prefabs/VisualFoodCollectorArea.prefab

@@ -558,6 +558,7 @@ GameObject:
   - component: {fileID: 114724832030926412}
   - component: {fileID: 114380897261200276}
   - component: {fileID: 114326390494230518}
+  - component: {fileID: 4034342608499629224}
   m_Layer: 0
   m_Name: Agent (3)
   m_TagString: agent
@@ -633,7 +634,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: VisualFoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114380897261200276
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -646,7 +647,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c66e6845309d241c78a6d77ee2567928, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxStep: 0
+  maxStep: 5000
   area: {fileID: 1145096862361766}
   turnSpeed: 300
   moveSpeed: 2
@@ -675,6 +676,21 @@ MonoBehaviour:
   height: 84
   grayscale: 0
   compression: 1
+--- !u!114 &4034342608499629224
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1165679820726490}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DecisionPeriod: 5
+  RepeatAction: 1
+  offsetStep: 0
 --- !u!1 &1179319070824364
 GameObject:
   m_ObjectHideFlags: 0
@@ -1120,6 +1136,7 @@ GameObject:
   - component: {fileID: 114942033465821694}
   - component: {fileID: 114869844339180154}
   - component: {fileID: 114429222608880102}
+  - component: {fileID: 7234640249101665162}
   m_Layer: 0
   m_Name: Agent (1)
   m_TagString: agent
@@ -1195,7 +1212,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: VisualFoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114869844339180154
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1208,7 +1225,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c66e6845309d241c78a6d77ee2567928, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxStep: 0
+  maxStep: 5000
   area: {fileID: 1145096862361766}
   turnSpeed: 300
   moveSpeed: 2
@@ -1237,6 +1254,21 @@ MonoBehaviour:
   height: 84
   grayscale: 0
   compression: 1
+--- !u!114 &7234640249101665162
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1317136368302180}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DecisionPeriod: 5
+  RepeatAction: 1
+  offsetStep: 0
 --- !u!1 &1353209702154624
 GameObject:
   m_ObjectHideFlags: 0
@@ -1572,7 +1604,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: VisualFoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114484596947519388
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3308,6 +3340,7 @@ GameObject:
   - component: {fileID: 114799611184247278}
   - component: {fileID: 114729119221978826}
   - component: {fileID: 114322691115031348}
+  - component: {fileID: 5903164052970896384}
   m_Layer: 0
   m_Name: Agent (2)
   m_TagString: agent
@@ -3383,7 +3416,7 @@ MonoBehaviour:
   m_BehaviorType: 0
   m_BehaviorName: VisualFoodCollector
   m_TeamID: 0
-  m_useChildSensors: 1
+  m_UseChildSensors: 1
 --- !u!114 &114729119221978826
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3396,7 +3429,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c66e6845309d241c78a6d77ee2567928, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxStep: 0
+  maxStep: 5000
   area: {fileID: 1145096862361766}
   turnSpeed: 300
   moveSpeed: 2
@@ -3425,6 +3458,21 @@ MonoBehaviour:
   height: 84
   grayscale: 0
   compression: 1
+--- !u!114 &5903164052970896384
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1939112378710628}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DecisionPeriod: 5
+  RepeatAction: 1
+  offsetStep: 0
 --- !u!1 &1971119195936814
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -143,7 +143,7 @@ void OverrideModel()
             var nnModel = GetModelForBehaviorName(bp.behaviorName);
             Debug.Log($"Overriding behavior {bp.behaviorName} for agent with model {nnModel?.name}");
             // This might give a null model; that's better because we'll fall back to the Heuristic
-            m_Agent.GiveModel($"Override_{bp.behaviorName}", nnModel, InferenceDevice.CPU);
+            m_Agent.GiveModel($"Override_{bp.behaviorName}", nnModel);
 
         }
     }

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

@@ -26,15 +26,14 @@ public enum Team
     [HideInInspector]
     public Rigidbody agentRb;
     SoccerSettings m_SoccerSettings;
-    Renderer m_AgentRenderer;
-    BehaviorParameters m_BP;
+    BehaviorParameters m_BehaviorParameters;
     Vector3 m_Transform;
 
     public override void InitializeAgent()
     {
         base.InitializeAgent();
-        m_BP = gameObject.GetComponent<BehaviorParameters>();
-        if (m_BP.m_TeamID == (int)Team.Blue)
+        m_BehaviorParameters = gameObject.GetComponent<BehaviorParameters>();
+        if (m_BehaviorParameters.m_TeamID == (int)Team.Blue)
         {
             team = Team.Blue;
             m_Transform = new Vector3(transform.position.x - 4f, .5f, transform.position.z);
@@ -44,7 +43,6 @@ public override void InitializeAgent()
             team = Team.Purple;
             m_Transform = new Vector3(transform.position.x + 4f, .5f, transform.position.z);
         }
-        m_AgentRenderer = GetComponentInChildren<Renderer>();
         m_SoccerSettings = FindObjectOfType<SoccerSettings>();
         agentRb = GetComponent<Rigidbody>();
         agentRb.maxAngularVelocity = 500;
@@ -65,8 +63,6 @@ public void MoveAgent(float[] act)
         var dirToGo = Vector3.zero;
         var rotateDir = Vector3.zero;
 
-        var action = Mathf.FloorToInt(act[0]);
-
         m_KickPower = 0f;
 
         var forwardAxis = (int)act[0];