Skip to content

Commit 35a00c9

Browse files
author
Ruo-Ping Dong
committed
Hybrid FoodCollector (#4746)
* use continuous action for moving and discrete for shooting * update models
1 parent 8617dc9 commit 35a00c9

19 files changed

+217
-134
lines changed

‎Project/Assets/ML-Agents/Examples/FoodCollector/Demos/ExpertFood.demo‎

30.7 KB
Binary file not shown.

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

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2180,15 +2180,20 @@ MonoBehaviour:
21802180
m_BrainParameters:
21812181
VectorObservationSize: 4
21822182
NumStackedVectorObservations: 1
2183-
VectorActionSize: 03000000030000000300000002000000
2183+
m_ActionSpec:
2184+
m_NumContinuousActions: 3
2185+
BranchSizes: 02000000
2186+
VectorActionSize:
21842187
VectorActionDescriptions: []
2185-
VectorActionSpaceType: 0
2186-
m_Model: {fileID: 11400000, guid: 36ab3e93020504f48858d0856f939685, type: 3}
2188+
VectorActionSpaceType: 1
2189+
hasUpgradedBrainParametersWithActionSpec: 1
2190+
m_Model: {fileID: 11400000, guid: 3210b528a2bc44a86bd6bd1d571070f8, type: 3}
21872191
m_InferenceDevice: 0
21882192
m_BehaviorType: 0
21892193
m_BehaviorName: FoodCollector
21902194
TeamId: 0
21912195
m_UseChildSensors: 1
2196+
m_UseChildActuators: 1
21922197
m_ObservableAttributeHandling: 0
21932198
--- !u!114 &114176228333253036
21942199
MonoBehaviour:
@@ -2216,6 +2221,7 @@ MonoBehaviour:
22162221
myLaser: {fileID: 1081721624670010}
22172222
contribute: 1
22182223
useVectorObs: 1
2224+
useVectorFrozenFlag: 0
22192225
--- !u!114 &114725457980523372
22202226
MonoBehaviour:
22212227
m_ObjectHideFlags: 0
@@ -2520,15 +2526,20 @@ MonoBehaviour:
25202526
m_BrainParameters:
25212527
VectorObservationSize: 4
25222528
NumStackedVectorObservations: 1
2523-
VectorActionSize: 03000000030000000300000002000000
2529+
m_ActionSpec:
2530+
m_NumContinuousActions: 3
2531+
BranchSizes: 02000000
2532+
VectorActionSize:
25242533
VectorActionDescriptions: []
2525-
VectorActionSpaceType: 0
2526-
m_Model: {fileID: 11400000, guid: 36ab3e93020504f48858d0856f939685, type: 3}
2534+
VectorActionSpaceType: 1
2535+
hasUpgradedBrainParametersWithActionSpec: 1
2536+
m_Model: {fileID: 11400000, guid: 3210b528a2bc44a86bd6bd1d571070f8, type: 3}
25272537
m_InferenceDevice: 0
25282538
m_BehaviorType: 0
25292539
m_BehaviorName: FoodCollector
25302540
TeamId: 0
25312541
m_UseChildSensors: 1
2542+
m_UseChildActuators: 1
25322543
m_ObservableAttributeHandling: 0
25332544
--- !u!114 &114711827726849508
25342545
MonoBehaviour:
@@ -2556,6 +2567,7 @@ MonoBehaviour:
25562567
myLaser: {fileID: 1941433838307300}
25572568
contribute: 0
25582569
useVectorObs: 1
2570+
useVectorFrozenFlag: 0
25592571
--- !u!114 &114443152683847924
25602572
MonoBehaviour:
25612573
m_ObjectHideFlags: 0
@@ -2851,15 +2863,20 @@ MonoBehaviour:
28512863
m_BrainParameters:
28522864
VectorObservationSize: 4
28532865
NumStackedVectorObservations: 1
2854-
VectorActionSize: 03000000030000000300000002000000
2866+
m_ActionSpec:
2867+
m_NumContinuousActions: 3
2868+
BranchSizes: 02000000
2869+
VectorActionSize:
28552870
VectorActionDescriptions: []
2856-
VectorActionSpaceType: 0
2857-
m_Model: {fileID: 11400000, guid: 36ab3e93020504f48858d0856f939685, type: 3}
2871+
VectorActionSpaceType: 1
2872+
hasUpgradedBrainParametersWithActionSpec: 1
2873+
m_Model: {fileID: 11400000, guid: 3210b528a2bc44a86bd6bd1d571070f8, type: 3}
28582874
m_InferenceDevice: 0
28592875
m_BehaviorType: 0
28602876
m_BehaviorName: FoodCollector
28612877
TeamId: 0
28622878
m_UseChildSensors: 1
2879+
m_UseChildActuators: 1
28632880
m_ObservableAttributeHandling: 0
28642881
--- !u!114 &114542632553128056
28652882
MonoBehaviour:
@@ -2887,6 +2904,7 @@ MonoBehaviour:
28872904
myLaser: {fileID: 1421240237750412}
28882905
contribute: 0
28892906
useVectorObs: 1
2907+
useVectorFrozenFlag: 0
28902908
--- !u!114 &114986980423924774
28912909
MonoBehaviour:
28922910
m_ObjectHideFlags: 0
@@ -3445,15 +3463,20 @@ MonoBehaviour:
34453463
m_BrainParameters:
34463464
VectorObservationSize: 4
34473465
NumStackedVectorObservations: 1
3448-
VectorActionSize: 03000000030000000300000002000000
3466+
m_ActionSpec:
3467+
m_NumContinuousActions: 3
3468+
BranchSizes: 02000000
3469+
VectorActionSize:
34493470
VectorActionDescriptions: []
3450-
VectorActionSpaceType: 0
3451-
m_Model: {fileID: 11400000, guid: 36ab3e93020504f48858d0856f939685, type: 3}
3471+
VectorActionSpaceType: 1
3472+
hasUpgradedBrainParametersWithActionSpec: 1
3473+
m_Model: {fileID: 11400000, guid: 3210b528a2bc44a86bd6bd1d571070f8, type: 3}
34523474
m_InferenceDevice: 0
34533475
m_BehaviorType: 0
34543476
m_BehaviorName: FoodCollector
34553477
TeamId: 0
34563478
m_UseChildSensors: 1
3479+
m_UseChildActuators: 1
34573480
m_ObservableAttributeHandling: 0
34583481
--- !u!114 &114189751434580810
34593482
MonoBehaviour:
@@ -3481,6 +3504,7 @@ MonoBehaviour:
34813504
myLaser: {fileID: 1617924810425504}
34823505
contribute: 0
34833506
useVectorObs: 1
3507+
useVectorFrozenFlag: 0
34843508
--- !u!114 &114644889237473510
34853509
MonoBehaviour:
34863510
m_ObjectHideFlags: 0
@@ -3762,15 +3786,20 @@ MonoBehaviour:
37623786
m_BrainParameters:
37633787
VectorObservationSize: 4
37643788
NumStackedVectorObservations: 1
3765-
VectorActionSize: 03000000030000000300000002000000
3789+
m_ActionSpec:
3790+
m_NumContinuousActions: 3
3791+
BranchSizes: 02000000
3792+
VectorActionSize:
37663793
VectorActionDescriptions: []
3767-
VectorActionSpaceType: 0
3768-
m_Model: {fileID: 11400000, guid: 36ab3e93020504f48858d0856f939685, type: 3}
3794+
VectorActionSpaceType: 1
3795+
hasUpgradedBrainParametersWithActionSpec: 1
3796+
m_Model: {fileID: 11400000, guid: 3210b528a2bc44a86bd6bd1d571070f8, type: 3}
37693797
m_InferenceDevice: 0
37703798
m_BehaviorType: 0
37713799
m_BehaviorName: FoodCollector
37723800
TeamId: 0
37733801
m_UseChildSensors: 1
3802+
m_UseChildActuators: 1
37743803
m_ObservableAttributeHandling: 0
37753804
--- !u!114 &114235147148547996
37763805
MonoBehaviour:
@@ -3798,6 +3827,7 @@ MonoBehaviour:
37983827
myLaser: {fileID: 1045923826166930}
37993828
contribute: 0
38003829
useVectorObs: 1
3830+
useVectorFrozenFlag: 0
38013831
--- !u!114 &114276061479012222
38023832
MonoBehaviour:
38033833
m_ObjectHideFlags: 0
@@ -4112,7 +4142,7 @@ Transform:
41124142
m_PrefabInstance: {fileID: 0}
41134143
m_PrefabAsset: {fileID: 0}
41144144
m_GameObject: {fileID: 1819751139121548}
4115-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
4145+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
41164146
m_LocalPosition: {x: 0, y: 12.3, z: 0}
41174147
m_LocalScale: {x: 1, y: 1, z: 1}
41184148
m_Children:

‎Project/Assets/ML-Agents/Examples/FoodCollector/Prefabs/GridFoodCollectorArea.prefab‎

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2180,10 +2180,14 @@ MonoBehaviour:
21802180
m_BrainParameters:
21812181
VectorObservationSize: 0
21822182
NumStackedVectorObservations: 1
2183-
VectorActionSize: 03000000030000000300000002000000
2183+
m_ActionSpec:
2184+
m_NumContinuousActions: 3
2185+
BranchSizes: 02000000
2186+
VectorActionSize:
21842187
VectorActionDescriptions: []
21852188
VectorActionSpaceType: 0
2186-
m_Model: {fileID: 11400000, guid: 699f852e79b5ba642871514fb1fb9843, type: 3}
2189+
hasUpgradedBrainParametersWithActionSpec: 1
2190+
m_Model: {fileID: 11400000, guid: 75910f45f20be49b18e2b95879a217b2, type: 3}
21872191
m_InferenceDevice: 0
21882192
m_BehaviorType: 0
21892193
m_BehaviorName: GridFoodCollector
@@ -2217,6 +2221,7 @@ MonoBehaviour:
22172221
myLaser: {fileID: 1081721624670010}
22182222
contribute: 0
22192223
useVectorObs: 0
2224+
useVectorFrozenFlag: 0
22202225
--- !u!114 &8297075921230369060
22212226
MonoBehaviour:
22222227
m_ObjectHideFlags: 0
@@ -2286,6 +2291,7 @@ MonoBehaviour:
22862291
- {r: 0, g: 0, b: 0, a: 0}
22872292
GizmoYOffset: 0
22882293
ShowGizmos: 0
2294+
CompressionType: 1
22892295
--- !u!1 &1482701732800114
22902296
GameObject:
22912297
m_ObjectHideFlags: 0
@@ -2532,10 +2538,14 @@ MonoBehaviour:
25322538
m_BrainParameters:
25332539
VectorObservationSize: 0
25342540
NumStackedVectorObservations: 1
2535-
VectorActionSize: 03000000030000000300000002000000
2541+
m_ActionSpec:
2542+
m_NumContinuousActions: 3
2543+
BranchSizes: 02000000
2544+
VectorActionSize:
25362545
VectorActionDescriptions: []
25372546
VectorActionSpaceType: 0
2538-
m_Model: {fileID: 11400000, guid: 699f852e79b5ba642871514fb1fb9843, type: 3}
2547+
hasUpgradedBrainParametersWithActionSpec: 1
2548+
m_Model: {fileID: 11400000, guid: 75910f45f20be49b18e2b95879a217b2, type: 3}
25392549
m_InferenceDevice: 0
25402550
m_BehaviorType: 0
25412551
m_BehaviorName: GridFoodCollector
@@ -2569,6 +2579,7 @@ MonoBehaviour:
25692579
myLaser: {fileID: 1941433838307300}
25702580
contribute: 0
25712581
useVectorObs: 0
2582+
useVectorFrozenFlag: 0
25722583
--- !u!114 &259154752087955944
25732584
MonoBehaviour:
25742585
m_ObjectHideFlags: 0
@@ -2625,6 +2636,7 @@ MonoBehaviour:
26252636
- {r: 0, g: 0, b: 0, a: 0}
26262637
GizmoYOffset: 0
26272638
ShowGizmos: 0
2639+
CompressionType: 1
26282640
--- !u!1 &1528397385587768
26292641
GameObject:
26302642
m_ObjectHideFlags: 0
@@ -2875,10 +2887,14 @@ MonoBehaviour:
28752887
m_BrainParameters:
28762888
VectorObservationSize: 0
28772889
NumStackedVectorObservations: 1
2878-
VectorActionSize: 03000000030000000300000002000000
2890+
m_ActionSpec:
2891+
m_NumContinuousActions: 3
2892+
BranchSizes: 02000000
2893+
VectorActionSize:
28792894
VectorActionDescriptions: []
28802895
VectorActionSpaceType: 0
2881-
m_Model: {fileID: 11400000, guid: 699f852e79b5ba642871514fb1fb9843, type: 3}
2896+
hasUpgradedBrainParametersWithActionSpec: 1
2897+
m_Model: {fileID: 11400000, guid: 75910f45f20be49b18e2b95879a217b2, type: 3}
28822898
m_InferenceDevice: 0
28832899
m_BehaviorType: 0
28842900
m_BehaviorName: GridFoodCollector
@@ -2912,6 +2928,7 @@ MonoBehaviour:
29122928
myLaser: {fileID: 1421240237750412}
29132929
contribute: 0
29142930
useVectorObs: 0
2931+
useVectorFrozenFlag: 0
29152932
--- !u!114 &5519119940433428255
29162933
MonoBehaviour:
29172934
m_ObjectHideFlags: 0
@@ -2968,6 +2985,7 @@ MonoBehaviour:
29682985
- {r: 0, g: 0, b: 0, a: 0}
29692986
GizmoYOffset: 0
29702987
ShowGizmos: 0
2988+
CompressionType: 1
29712989
--- !u!1 &1617924810425504
29722990
GameObject:
29732991
m_ObjectHideFlags: 0
@@ -3481,10 +3499,14 @@ MonoBehaviour:
34813499
m_BrainParameters:
34823500
VectorObservationSize: 0
34833501
NumStackedVectorObservations: 1
3484-
VectorActionSize: 03000000030000000300000002000000
3502+
m_ActionSpec:
3503+
m_NumContinuousActions: 3
3504+
BranchSizes: 02000000
3505+
VectorActionSize:
34853506
VectorActionDescriptions: []
34863507
VectorActionSpaceType: 0
3487-
m_Model: {fileID: 11400000, guid: 699f852e79b5ba642871514fb1fb9843, type: 3}
3508+
hasUpgradedBrainParametersWithActionSpec: 1
3509+
m_Model: {fileID: 11400000, guid: 75910f45f20be49b18e2b95879a217b2, type: 3}
34883510
m_InferenceDevice: 0
34893511
m_BehaviorType: 0
34903512
m_BehaviorName: GridFoodCollector
@@ -3518,6 +3540,7 @@ MonoBehaviour:
35183540
myLaser: {fileID: 1617924810425504}
35193541
contribute: 0
35203542
useVectorObs: 0
3543+
useVectorFrozenFlag: 0
35213544
--- !u!114 &5884750436653390196
35223545
MonoBehaviour:
35233546
m_ObjectHideFlags: 0
@@ -3574,6 +3597,7 @@ MonoBehaviour:
35743597
- {r: 0, g: 0, b: 0, a: 0}
35753598
GizmoYOffset: 0
35763599
ShowGizmos: 0
3600+
CompressionType: 1
35773601
--- !u!1 &1688105343773098
35783602
GameObject:
35793603
m_ObjectHideFlags: 0
@@ -3810,10 +3834,14 @@ MonoBehaviour:
38103834
m_BrainParameters:
38113835
VectorObservationSize: 0
38123836
NumStackedVectorObservations: 1
3813-
VectorActionSize: 03000000030000000300000002000000
3837+
m_ActionSpec:
3838+
m_NumContinuousActions: 3
3839+
BranchSizes: 02000000
3840+
VectorActionSize:
38143841
VectorActionDescriptions: []
38153842
VectorActionSpaceType: 0
3816-
m_Model: {fileID: 11400000, guid: 699f852e79b5ba642871514fb1fb9843, type: 3}
3843+
hasUpgradedBrainParametersWithActionSpec: 1
3844+
m_Model: {fileID: 11400000, guid: 75910f45f20be49b18e2b95879a217b2, type: 3}
38173845
m_InferenceDevice: 0
38183846
m_BehaviorType: 0
38193847
m_BehaviorName: GridFoodCollector
@@ -3847,6 +3875,7 @@ MonoBehaviour:
38473875
myLaser: {fileID: 1045923826166930}
38483876
contribute: 0
38493877
useVectorObs: 0
3878+
useVectorFrozenFlag: 0
38503879
--- !u!114 &4768752321433982785
38513880
MonoBehaviour:
38523881
m_ObjectHideFlags: 0
@@ -3903,6 +3932,7 @@ MonoBehaviour:
39033932
- {r: 0, g: 0, b: 0, a: 0}
39043933
GizmoYOffset: 0
39053934
ShowGizmos: 0
3935+
CompressionType: 1
39063936
--- !u!1 &1729825611722018
39073937
GameObject:
39083938
m_ObjectHideFlags: 0
@@ -4172,7 +4202,7 @@ Transform:
41724202
m_PrefabInstance: {fileID: 0}
41734203
m_PrefabAsset: {fileID: 0}
41744204
m_GameObject: {fileID: 1819751139121548}
4175-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
4205+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
41764206
m_LocalPosition: {x: 0, y: 12.3, z: 0}
41774207
m_LocalScale: {x: 1, y: 1, z: 1}
41784208
m_Children:

0 commit comments

Comments
 (0)