folder structure reordered

roboserg · Dec 26, 2020 · 2d838c1 · 2d838c1
1 parent fc37f95
commit 2d838c1
Show file tree

Hide file tree

Showing 45 changed files with 34 additions and 15 deletions.
diff --git a/Assets/Brains/Basic-299980.onnx b/Assets/Brains/Basic-299980.onnx
diff --git a/Assets/Brains.meta → Assets/ML-Agents/Brains.meta b/Assets/Brains.meta → Assets/ML-Agents/Brains.meta
diff --git a/Assets/Brains/40M BallDodge.onnx → Assets/ML-Agents/Brains/40M BallDodge.onnx b/Assets/Brains/40M BallDodge.onnx → Assets/ML-Agents/Brains/40M BallDodge.onnx
diff --git a/Assets/Brains/40M BallDodge.onnx.meta → .../ML-Agents/Brains/40M BallDodge.onnx.meta b/Assets/Brains/40M BallDodge.onnx.meta → .../ML-Agents/Brains/40M BallDodge.onnx.meta
diff --git a/Assets/ML-Agents/Brains/Basic-1199996.onnx b/Assets/ML-Agents/Brains/Basic-1199996.onnx
diff --git a/Assets/Brains/Basic-299980.onnx.meta → .../ML-Agents/Brains/Basic-1199996.onnx.meta b/Assets/Brains/Basic-299980.onnx.meta → .../ML-Agents/Brains/Basic-1199996.onnx.meta
diff --git a/Assets/ML-Agents/Brains/Basic-2699940.onnx b/Assets/ML-Agents/Brains/Basic-2699940.onnx
diff --git a/Assets/ML-Agents/Brains/Basic-2699940.onnx.meta b/Assets/ML-Agents/Brains/Basic-2699940.onnx.meta
diff --git a/Assets/ML-Agents/Brains/Basic-3604614.onnx b/Assets/ML-Agents/Brains/Basic-3604614.onnx
diff --git a/Assets/ML-Agents/Brains/Basic-3604614.onnx.meta b/Assets/ML-Agents/Brains/Basic-3604614.onnx.meta
diff --git a/Assets/Brains/ConstantAir.onnx → Assets/ML-Agents/Brains/ConstantAir.onnx b/Assets/Brains/ConstantAir.onnx → Assets/ML-Agents/Brains/ConstantAir.onnx
diff --git a/Assets/Brains/ConstantAir.onnx.meta → ...ts/ML-Agents/Brains/ConstantAir.onnx.meta b/Assets/Brains/ConstantAir.onnx.meta → ...ts/ML-Agents/Brains/ConstantAir.onnx.meta
diff --git a/Assets/Brains/MaxSpeedAgent.onnx → Assets/ML-Agents/Brains/MaxSpeedAgent.onnx b/Assets/Brains/MaxSpeedAgent.onnx → Assets/ML-Agents/Brains/MaxSpeedAgent.onnx
diff --git a/Assets/Brains/MaxSpeedAgent.onnx.meta → .../ML-Agents/Brains/MaxSpeedAgent.onnx.meta b/Assets/Brains/MaxSpeedAgent.onnx.meta → .../ML-Agents/Brains/MaxSpeedAgent.onnx.meta
diff --git a/Assets/Brains/MaxSpeedAgent2.onnx → Assets/ML-Agents/Brains/MaxSpeedAgent2.onnx b/Assets/Brains/MaxSpeedAgent2.onnx → Assets/ML-Agents/Brains/MaxSpeedAgent2.onnx
diff --git a/Assets/Brains/MaxSpeedAgent2.onnx.meta → ...ML-Agents/Brains/MaxSpeedAgent2.onnx.meta b/Assets/Brains/MaxSpeedAgent2.onnx.meta → ...ML-Agents/Brains/MaxSpeedAgent2.onnx.meta
diff --git a/Assets/Brains/Superhuman.onnx → Assets/ML-Agents/Brains/Superhuman.onnx b/Assets/Brains/Superhuman.onnx → Assets/ML-Agents/Brains/Superhuman.onnx
diff --git a/Assets/Brains/Superhuman.onnx.meta → Assets/ML-Agents/Brains/Superhuman.onnx.meta b/Assets/Brains/Superhuman.onnx.meta → Assets/ML-Agents/Brains/Superhuman.onnx.meta
diff --git a/Assets/ML/CubeAgent.cs → Assets/ML-Agents/CubeAgent.cs b/Assets/ML/CubeAgent.cs → Assets/ML-Agents/CubeAgent.cs
diff --git a/Assets/ML/CubeAgent.cs.meta → Assets/ML-Agents/CubeAgent.cs.meta b/Assets/ML/CubeAgent.cs.meta → Assets/ML-Agents/CubeAgent.cs.meta
diff --git a/Assets/ML/SimpleAgent/HomingMissile.cs → Assets/ML-Agents/HomingMissile.cs b/Assets/ML/SimpleAgent/HomingMissile.cs → Assets/ML-Agents/HomingMissile.cs
diff --git a/Assets/ML/SimpleAgent/HomingMissile.cs.meta → Assets/ML-Agents/HomingMissile.cs.meta b/Assets/ML/SimpleAgent/HomingMissile.cs.meta → Assets/ML-Agents/HomingMissile.cs.meta
diff --git a/Assets/ML/SimpleAgent/SimpleAgent.cs → Assets/ML-Agents/SimpleAgent.cs b/Assets/ML/SimpleAgent/SimpleAgent.cs → Assets/ML-Agents/SimpleAgent.cs
diff --git a/Assets/ML/SimpleAgent/SimpleAgent.cs.meta → Assets/ML-Agents/SimpleAgent.cs.meta b/Assets/ML/SimpleAgent/SimpleAgent.cs.meta → Assets/ML-Agents/SimpleAgent.cs.meta
diff --git a/Assets/ML-Agents/Timers/SimpleMLTest_timers.json b/Assets/ML-Agents/Timers/SimpleMLTest_timers.json
@@ -1 +1 @@
-{"count":1,"self":44.237007999999996,"total":44.5623477,"children":{"InitializeActuators":{"count":12,"self":0.00074869999999999993,"total":0.00074869999999999993,"children":null},"InitializeSensors":{"count":12,"self":0.0007492,"total":0.0007492,"children":null},"AgentSendState":{"count":3975,"self":0.021243599999999998,"total":0.0465613,"children":{"CollectObservations":{"count":4776,"self":0.0067471,"total":0.0067471,"children":null},"WriteActionMask":{"count":4776,"self":0.0035699,"total":0.0035699,"children":null},"RequestDecision":{"count":4776,"self":0.015000699999999999,"total":0.015000699999999999,"children":null}}},"DecideAction":{"count":3975,"self":0.2338804,"total":0.2338804,"children":null},"AgentAct":{"count":3975,"self":0.0433995,"total":0.0433995,"children":null}},"gauges":{"Basic.CumulativeReward":{"count":54,"max":25.2758465,"min":4.271543,"runningAverage":11.6939135,"value":11.4798326,"weightedAverage":11.8432007}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1609001847","unity_version":"2020.1.17f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2020.1.17f1\\Editor\\Unity.exe -projectpath I:\/Unity ML Agents\/RoboLeague -useHub -hubIPC -cloudEnvironment production -hubSessionId bea597f0-4630-11eb-a76d-53114b39d51d -accessToken HKlxPVYdQnwI1HdWXJ75air0y8fz2HuMs0BZxQauPY8008f","communication_protocol_version":"1.3.0","com.unity.ml-agents_version":"1.7.0-preview","scene_name":"SimpleMLTest","end_time_seconds":"1609001892"}}
+{"count":1,"self":33.937743999999995,"total":34.268128499999996,"children":{"InitializeActuators":{"count":12,"self":0.0014999,"total":0.0014999,"children":null},"InitializeSensors":{"count":12,"self":0.0007511,"total":0.0007511,"children":null},"AgentSendState":{"count":2944,"self":0.0232535,"total":0.0405052,"children":{"CollectObservations":{"count":3540,"self":0.0075014999999999995,"total":0.0075014999999999995,"children":null},"WriteActionMask":{"count":3540,"self":0,"total":0,"children":null},"RequestDecision":{"count":3540,"self":0.0097501999999999988,"total":0.0097501999999999988,"children":null}}},"DecideAction":{"count":2944,"self":0.2493772,"total":0.2493772,"children":null},"AgentAct":{"count":2944,"self":0.037502799999999996,"total":0.037502799999999996,"children":null}},"gauges":{"Basic.CumulativeReward":{"count":95,"max":10.991621,"min":6.01677132,"runningAverage":9.208001,"value":9.056425,"weightedAverage":8.683014}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1609003356","unity_version":"2020.1.17f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2020.1.17f1\\Editor\\Unity.exe -projectpath I:\/Unity ML Agents\/RoboLeague -useHub -hubIPC -cloudEnvironment production -hubSessionId bea597f0-4630-11eb-a76d-53114b39d51d -accessToken HKlxPVYdQnwI1HdWXJ75air0y8fz2HuMs0BZxQauPY8008f","communication_protocol_version":"1.3.0","com.unity.ml-agents_version":"1.7.0-preview","scene_name":"SimpleMLTest","end_time_seconds":"1609003390"}}
diff --git a/Assets/ML.meta b/Assets/ML.meta
diff --git a/Assets/Prefabs/Arena.prefab b/Assets/Prefabs/Arena.prefab
@@ -1017,7 +1017,7 @@ MonoBehaviour:
     VectorActionDescriptions: []
     VectorActionSpaceType: 1
     hasUpgradedBrainParametersWithActionSpec: 1
-  m_Model: {fileID: 5022602860645237092, guid: 7b014874e5e5516479329a3650b62d70, type: 3}
+  m_Model: {fileID: 5022602860645237092, guid: 8a0f9d837fe72404ca55ae39c522a107, type: 3}
   m_InferenceDevice: 0
   m_BehaviorType: 0
   m_BehaviorName: Basic
@@ -1070,7 +1070,7 @@ MonoBehaviour:
   agentParameters:
     maxStep: 0
   hasUpgradedFromAgentParameters: 1
-  MaxStep: 5000
+  MaxStep: 10000
 --- !u!1 &6552868317765564533
 GameObject:
   m_ObjectHideFlags: 0
@@ -1092,7 +1092,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5420903775267257166
 Transform:
   m_ObjectHideFlags: 0

diff --git a/Assets/ML/SimpleAgent/SimpleMLTest.unity → Assets/Scenes/SimpleMLTest.unity b/Assets/ML/SimpleAgent/SimpleMLTest.unity → Assets/Scenes/SimpleMLTest.unity
diff --git a/...ts/ML/SimpleAgent/SimpleMLTest.unity.meta → Assets/Scenes/SimpleMLTest.unity.meta b/...ts/ML/SimpleAgent/SimpleMLTest.unity.meta → Assets/Scenes/SimpleMLTest.unity.meta
diff --git a/Assets/Scripts/CarControllers/MyRayCast.meta → ...ripts/CarControllers/Other/MyRayCast.meta b/Assets/Scripts/CarControllers/MyRayCast.meta → ...ripts/CarControllers/Other/MyRayCast.meta
diff --git a/...CarControllers/MyRayCast/RayController.cs → ...trollers/Other/MyRayCast/RayController.cs b/...CarControllers/MyRayCast/RayController.cs → ...trollers/Other/MyRayCast/RayController.cs
diff --git a/...ntrollers/MyRayCast/RayController.cs.meta → ...ers/Other/MyRayCast/RayController.cs.meta b/...ntrollers/MyRayCast/RayController.cs.meta → ...ers/Other/MyRayCast/RayController.cs.meta
diff --git a/...ipts/CarControllers/MyRayCast/RayWheel.cs → ...arControllers/Other/MyRayCast/RayWheel.cs b/...ipts/CarControllers/MyRayCast/RayWheel.cs → ...arControllers/Other/MyRayCast/RayWheel.cs
diff --git a/...CarControllers/MyRayCast/RayWheel.cs.meta → ...trollers/Other/MyRayCast/RayWheel.cs.meta b/...CarControllers/MyRayCast/RayWheel.cs.meta → ...trollers/Other/MyRayCast/RayWheel.cs.meta
diff --git a/Assets/ML/SimpleAgent.meta → ...ipts/CarControllers/SimpleController.meta b/Assets/ML/SimpleAgent.meta → ...ipts/CarControllers/SimpleController.meta
diff --git a/Assets/ML/SimpleAgent/SimpleAirControl.cs → ...lers/SimpleController/SimpleAirControl.cs b/Assets/ML/SimpleAgent/SimpleAirControl.cs → ...lers/SimpleController/SimpleAirControl.cs
diff --git a/...s/ML/SimpleAgent/SimpleAirControl.cs.meta → ...SimpleController/SimpleAirControl.cs.meta b/...s/ML/SimpleAgent/SimpleAirControl.cs.meta → ...SimpleController/SimpleAirControl.cs.meta
diff --git a/Assets/ML/SimpleAgent/SimpleCarAgent.cs → ...ollers/SimpleController/SimpleCarAgent.cs b/Assets/ML/SimpleAgent/SimpleCarAgent.cs → ...ollers/SimpleController/SimpleCarAgent.cs
@@ -43,16 +43,17 @@ public override void OnActionReceived(ActionBuffers actionBuffers)
         _airControl.inputYaw = inputYaw;
         _airControl.inputPitch = inputPitch;
         _airControl.inputRoll = inputRoll;
+        _airControl.inputRoll = 1;
         _airControl.inputBoost = inputBoost;
 
         if(Mathf.Abs(transform.localPosition.y) > 40 || Mathf.Abs(transform.localPosition.x) > 60 || Mathf.Abs(transform.localPosition.z) > 60)
             EndEpisode();
 
-        AddReward(inputRoll/300); // 0.01
+        //AddReward(inputRoll/300); // 0.01
         //AddReward(inputBoost ? 0.01f : 0);
         //Debug.Log(actionBuffers.ContinuousActions[2]);
         //Debug.Log(inputRoll);
-        //AddReward(0.01f);
+        AddReward(0.01f);
         AddReward(_controller.velMagn / 1000);
     }
 

diff --git a/Assets/ML/SimpleAgent/SimpleCarAgent.cs.meta → ...s/SimpleController/SimpleCarAgent.cs.meta b/Assets/ML/SimpleAgent/SimpleCarAgent.cs.meta → ...s/SimpleController/SimpleCarAgent.cs.meta
diff --git a/Assets/ML/SimpleAgent/SimpleController.cs → ...lers/SimpleController/SimpleController.cs b/Assets/ML/SimpleAgent/SimpleController.cs → ...lers/SimpleController/SimpleController.cs
diff --git a/...s/ML/SimpleAgent/SimpleController.cs.meta → ...SimpleController/SimpleController.cs.meta b/...s/ML/SimpleAgent/SimpleController.cs.meta → ...SimpleController/SimpleController.cs.meta
diff --git a/...ts/ML/SimpleAgent/SimpleParticleSystem.cs → .../SimpleController/SimpleParticleSystem.cs b/...ts/ML/SimpleAgent/SimpleParticleSystem.cs → .../SimpleController/SimpleParticleSystem.cs
diff --git a/.../SimpleAgent/SimpleParticleSystem.cs.meta → ...leController/SimpleParticleSystem.cs.meta b/.../SimpleAgent/SimpleParticleSystem.cs.meta → ...leController/SimpleParticleSystem.cs.meta
diff --git a/Assets/ML/SimpleAgent/UIManager.cs → ...Controllers/SimpleController/UIManager.cs b/Assets/ML/SimpleAgent/UIManager.cs → ...Controllers/SimpleController/UIManager.cs
diff --git a/Assets/ML/SimpleAgent/UIManager.cs.meta → ...ollers/SimpleController/UIManager.cs.meta b/Assets/ML/SimpleAgent/UIManager.cs.meta → ...ollers/SimpleController/UIManager.cs.meta
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"count":1,"self":44.237007999999996,"total":44.5623477,"children":{"InitializeActuators":{"count":12,"self":0.00074869999999999993,"total":0.00074869999999999993,"children":null},"InitializeSensors":{"count":12,"self":0.0007492,"total":0.0007492,"children":null},"AgentSendState":{"count":3975,"self":0.021243599999999998,"total":0.0465613,"children":{"CollectObservations":{"count":4776,"self":0.0067471,"total":0.0067471,"children":null},"WriteActionMask":{"count":4776,"self":0.0035699,"total":0.0035699,"children":null},"RequestDecision":{"count":4776,"self":0.015000699999999999,"total":0.015000699999999999,"children":null}}},"DecideAction":{"count":3975,"self":0.2338804,"total":0.2338804,"children":null},"AgentAct":{"count":3975,"self":0.0433995,"total":0.0433995,"children":null}},"gauges":{"Basic.CumulativeReward":{"count":54,"max":25.2758465,"min":4.271543,"runningAverage":11.6939135,"value":11.4798326,"weightedAverage":11.8432007}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1609001847","unity_version":"2020.1.17f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2020.1.17f1\\Editor\\Unity.exe -projectpath I:\/Unity ML Agents\/RoboLeague -useHub -hubIPC -cloudEnvironment production -hubSessionId bea597f0-4630-11eb-a76d-53114b39d51d -accessToken HKlxPVYdQnwI1HdWXJ75air0y8fz2HuMs0BZxQauPY8008f","communication_protocol_version":"1.3.0","com.unity.ml-agents_version":"1.7.0-preview","scene_name":"SimpleMLTest","end_time_seconds":"1609001892"}}
		{"count":1,"self":33.937743999999995,"total":34.268128499999996,"children":{"InitializeActuators":{"count":12,"self":0.0014999,"total":0.0014999,"children":null},"InitializeSensors":{"count":12,"self":0.0007511,"total":0.0007511,"children":null},"AgentSendState":{"count":2944,"self":0.0232535,"total":0.0405052,"children":{"CollectObservations":{"count":3540,"self":0.0075014999999999995,"total":0.0075014999999999995,"children":null},"WriteActionMask":{"count":3540,"self":0,"total":0,"children":null},"RequestDecision":{"count":3540,"self":0.0097501999999999988,"total":0.0097501999999999988,"children":null}}},"DecideAction":{"count":2944,"self":0.2493772,"total":0.2493772,"children":null},"AgentAct":{"count":2944,"self":0.037502799999999996,"total":0.037502799999999996,"children":null}},"gauges":{"Basic.CumulativeReward":{"count":95,"max":10.991621,"min":6.01677132,"runningAverage":9.208001,"value":9.056425,"weightedAverage":8.683014}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1609003356","unity_version":"2020.1.17f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2020.1.17f1\\Editor\\Unity.exe -projectpath I:\/Unity ML Agents\/RoboLeague -useHub -hubIPC -cloudEnvironment production -hubSessionId bea597f0-4630-11eb-a76d-53114b39d51d -accessToken HKlxPVYdQnwI1HdWXJ75air0y8fz2HuMs0BZxQauPY8008f","communication_protocol_version":"1.3.0","com.unity.ml-agents_version":"1.7.0-preview","scene_name":"SimpleMLTest","end_time_seconds":"1609003390"}}