Skip to content

Commit a1cb29b

Browse files
committed
Updating the barracuda 1.4.0 (#5291)
Initial commit second commit. The no-extrinsic was trained without the log reward (reward = prob) while the new one is (reward = log_prob - log_prior) A few results, it looks like Walker-diverse-r05-bigger.onnx is doing something Modified pushblock using next state and action. Did not help Fixing bug that had 9 diversity settings instead of 8 removing results
1 parent e695fc1 commit a1cb29b

27 files changed

+505
-54
lines changed

Project/Assets/ML-Agents/Examples/PushBlock/Prefabs/PushBlockArea.prefab

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ MeshRenderer:
5454
m_MotionVectors: 1
5555
m_LightProbeUsage: 1
5656
m_ReflectionProbeUsage: 1
57+
m_RayTracingMode: 2
5758
m_RenderingLayerMask: 1
5859
m_RendererPriority: 0
5960
m_Materials:
@@ -65,6 +66,7 @@ MeshRenderer:
6566
m_ProbeAnchor: {fileID: 0}
6667
m_LightProbeVolumeOverride: {fileID: 0}
6768
m_ScaleInLightmap: 1
69+
m_ReceiveGI: 1
6870
m_PreserveUVs: 1
6971
m_IgnoreNormalsForChartDetection: 0
7072
m_ImportantGI: 0
@@ -171,6 +173,7 @@ MeshRenderer:
171173
m_MotionVectors: 1
172174
m_LightProbeUsage: 1
173175
m_ReflectionProbeUsage: 1
176+
m_RayTracingMode: 2
174177
m_RenderingLayerMask: 1
175178
m_RendererPriority: 0
176179
m_Materials:
@@ -182,6 +185,7 @@ MeshRenderer:
182185
m_ProbeAnchor: {fileID: 0}
183186
m_LightProbeVolumeOverride: {fileID: 0}
184187
m_ScaleInLightmap: 1
188+
m_ReceiveGI: 1
185189
m_PreserveUVs: 1
186190
m_IgnoreNormalsForChartDetection: 0
187191
m_ImportantGI: 0
@@ -249,6 +253,7 @@ MeshRenderer:
249253
m_MotionVectors: 1
250254
m_LightProbeUsage: 1
251255
m_ReflectionProbeUsage: 1
256+
m_RayTracingMode: 2
252257
m_RenderingLayerMask: 1
253258
m_RendererPriority: 0
254259
m_Materials:
@@ -260,6 +265,7 @@ MeshRenderer:
260265
m_ProbeAnchor: {fileID: 0}
261266
m_LightProbeVolumeOverride: {fileID: 0}
262267
m_ScaleInLightmap: 1
268+
m_ReceiveGI: 1
263269
m_PreserveUVs: 0
264270
m_IgnoreNormalsForChartDetection: 0
265271
m_ImportantGI: 0
@@ -339,6 +345,7 @@ MeshRenderer:
339345
m_MotionVectors: 1
340346
m_LightProbeUsage: 1
341347
m_ReflectionProbeUsage: 1
348+
m_RayTracingMode: 2
342349
m_RenderingLayerMask: 1
343350
m_RendererPriority: 0
344351
m_Materials:
@@ -350,6 +357,7 @@ MeshRenderer:
350357
m_ProbeAnchor: {fileID: 0}
351358
m_LightProbeVolumeOverride: {fileID: 0}
352359
m_ScaleInLightmap: 1
360+
m_ReceiveGI: 1
353361
m_PreserveUVs: 1
354362
m_IgnoreNormalsForChartDetection: 0
355363
m_ImportantGI: 0
@@ -379,6 +387,7 @@ GameObject:
379387
- component: {fileID: 114451319691753174}
380388
- component: {fileID: 8964598783836598940}
381389
- component: {fileID: 4081319787948195948}
390+
- component: {fileID: 3604832710400578108}
382391
m_Layer: 0
383392
m_Name: Agent
384393
m_TagString: agent
@@ -570,6 +579,21 @@ MonoBehaviour:
570579
m_Name:
571580
m_EditorClassIdentifier:
572581
debugCommandLineOverride:
582+
--- !u!114 &3604832710400578108
583+
MonoBehaviour:
584+
m_ObjectHideFlags: 0
585+
m_CorrespondingSourceObject: {fileID: 0}
586+
m_PrefabInstance: {fileID: 0}
587+
m_PrefabAsset: {fileID: 0}
588+
m_GameObject: {fileID: 1489716781518988}
589+
m_Enabled: 1
590+
m_EditorHideFlags: 0
591+
m_Script: {fileID: 11500000, guid: 38b7cc1f5819445aa85e9a9b054552dc, type: 3}
592+
m_Name:
593+
m_EditorClassIdentifier:
594+
m_SensorName: VectorSensor
595+
m_ObservationSize: 8
596+
m_ObservationType: 1
573597
--- !u!1 &1500989011945850
574598
GameObject:
575599
m_ObjectHideFlags: 0
@@ -625,6 +649,7 @@ MeshRenderer:
625649
m_MotionVectors: 1
626650
m_LightProbeUsage: 1
627651
m_ReflectionProbeUsage: 1
652+
m_RayTracingMode: 2
628653
m_RenderingLayerMask: 1
629654
m_RendererPriority: 0
630655
m_Materials:
@@ -636,6 +661,7 @@ MeshRenderer:
636661
m_ProbeAnchor: {fileID: 0}
637662
m_LightProbeVolumeOverride: {fileID: 0}
638663
m_ScaleInLightmap: 1
664+
m_ReceiveGI: 1
639665
m_PreserveUVs: 0
640666
m_IgnoreNormalsForChartDetection: 0
641667
m_ImportantGI: 0
@@ -715,6 +741,7 @@ MeshRenderer:
715741
m_MotionVectors: 1
716742
m_LightProbeUsage: 1
717743
m_ReflectionProbeUsage: 1
744+
m_RayTracingMode: 2
718745
m_RenderingLayerMask: 1
719746
m_RendererPriority: 0
720747
m_Materials:
@@ -726,6 +753,7 @@ MeshRenderer:
726753
m_ProbeAnchor: {fileID: 0}
727754
m_LightProbeVolumeOverride: {fileID: 0}
728755
m_ScaleInLightmap: 1
756+
m_ReceiveGI: 1
729757
m_PreserveUVs: 1
730758
m_IgnoreNormalsForChartDetection: 0
731759
m_ImportantGI: 0
@@ -781,9 +809,10 @@ Camera:
781809
m_ClearFlags: 2
782810
m_BackGroundColor: {r: 0.46666667, g: 0.5647059, b: 0.60784316, a: 1}
783811
m_projectionMatrixMode: 1
812+
m_GateFitMode: 2
813+
m_FOVAxisMode: 0
784814
m_SensorSize: {x: 36, y: 24}
785815
m_LensShift: {x: 0, y: 0}
786-
m_GateFitMode: 2
787816
m_FocalLength: 50
788817
m_NormalizedViewPortRect:
789818
serializedVersion: 2
@@ -881,6 +910,7 @@ MeshRenderer:
881910
m_MotionVectors: 1
882911
m_LightProbeUsage: 1
883912
m_ReflectionProbeUsage: 1
913+
m_RayTracingMode: 2
884914
m_RenderingLayerMask: 1
885915
m_RendererPriority: 0
886916
m_Materials:
@@ -892,6 +922,7 @@ MeshRenderer:
892922
m_ProbeAnchor: {fileID: 0}
893923
m_LightProbeVolumeOverride: {fileID: 0}
894924
m_ScaleInLightmap: 1
925+
m_ReceiveGI: 1
895926
m_PreserveUVs: 1
896927
m_IgnoreNormalsForChartDetection: 0
897928
m_ImportantGI: 0
@@ -991,6 +1022,7 @@ MeshRenderer:
9911022
m_MotionVectors: 1
9921023
m_LightProbeUsage: 1
9931024
m_ReflectionProbeUsage: 1
1025+
m_RayTracingMode: 2
9941026
m_RenderingLayerMask: 1
9951027
m_RendererPriority: 0
9961028
m_Materials:
@@ -1002,6 +1034,7 @@ MeshRenderer:
10021034
m_ProbeAnchor: {fileID: 0}
10031035
m_LightProbeVolumeOverride: {fileID: 0}
10041036
m_ScaleInLightmap: 1
1037+
m_ReceiveGI: 1
10051038
m_PreserveUVs: 0
10061039
m_IgnoreNormalsForChartDetection: 0
10071040
m_ImportantGI: 0
@@ -1120,6 +1153,7 @@ MeshRenderer:
11201153
m_MotionVectors: 1
11211154
m_LightProbeUsage: 1
11221155
m_ReflectionProbeUsage: 1
1156+
m_RayTracingMode: 2
11231157
m_RenderingLayerMask: 1
11241158
m_RendererPriority: 0
11251159
m_Materials:
@@ -1131,6 +1165,7 @@ MeshRenderer:
11311165
m_ProbeAnchor: {fileID: 0}
11321166
m_LightProbeVolumeOverride: {fileID: 0}
11331167
m_ScaleInLightmap: 1
1168+
m_ReceiveGI: 1
11341169
m_PreserveUVs: 1
11351170
m_IgnoreNormalsForChartDetection: 0
11361171
m_ImportantGI: 0

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using UnityEngine;
55
using Unity.MLAgents;
66
using Unity.MLAgents.Actuators;
7+
using Unity.MLAgents.Sensors;
78

89
public class PushAgentBasic : Agent
910
{
@@ -75,6 +76,21 @@ public override void Initialize()
7576
m_ResetParams = Academy.Instance.EnvironmentParameters;
7677

7778
SetResetParameters();
79+
GetComponent<VectorSensorComponent>().CreateSensors();
80+
m_DiversitySettingSensor = GetComponent<VectorSensorComponent>();
81+
}
82+
83+
VectorSensorComponent m_DiversitySettingSensor;
84+
public int m_DiversitySetting = 0;
85+
86+
87+
/// <summary>
88+
/// Loop over body parts to add them to observation.
89+
/// </summary>
90+
public override void CollectObservations(VectorSensor sensor)
91+
{
92+
m_DiversitySettingSensor.GetSensor().Reset();
93+
m_DiversitySettingSensor.GetSensor().AddOneHotObservation(m_DiversitySetting, 8);
7894
}
7995

8096
/// <summary>
@@ -226,6 +242,7 @@ public override void OnEpisodeBegin()
226242
m_AgentRb.angularVelocity = Vector3.zero;
227243

228244
SetResetParameters();
245+
m_DiversitySetting = Random.Range(0, 8);
229246
}
230247

231248
public void SetGroundMaterialFriction()

0 commit comments

Comments
 (0)