Skip to content

Commit 2f12007

Browse files
Develop one to one scene edits (#2744)
* Delting all brains, setting Behavior Parameters * Removing learning from all the configs * Forgot one agent * Removing leftover brains * Dead meta file * Adding Heuristics
1 parent 49152e4 commit 2f12007

File tree

131 files changed

+1456
-14195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+1456
-14195
lines changed

UnitySDK/Assets/ML-Agents/Examples/3DBall/Prefabs/3DBallHardNew.prefab

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -608,18 +608,17 @@ MonoBehaviour:
608608
m_Script: {fileID: 11500000, guid: edf26e11cf4ed42eaa3ffb7b91bb4676, type: 3}
609609
m_Name:
610610
m_EditorClassIdentifier:
611-
m_BrainFactoryParameters:
612-
behaviorName: MyBehaviorHard
613-
brainParameters:
614-
vectorObservationSize: 5
615-
numStackedVectorObservations: 1
616-
vectorActionSize: 02000000
617-
cameraResolutions: []
618-
vectorActionDescriptions: []
619-
vectorActionSpaceType: 1
620-
model: {fileID: 0}
621-
inferenceDevice: 0
622-
useHeuristic: 0
611+
m_BrainParameters:
612+
vectorObservationSize: 5
613+
numStackedVectorObservations: 9
614+
vectorActionSize: 02000000
615+
cameraResolutions: []
616+
vectorActionDescriptions: []
617+
vectorActionSpaceType: 1
618+
m_Model: {fileID: 11400000, guid: cee7d20369b814d549573de7e76c4a81, type: 3}
619+
m_InferenceDevice: 0
620+
m_UseHeuristic: 0
621+
m_BehaviorName: 3DBallHard
623622
agentParameters:
624623
agentCameras: []
625624
agentRenderTextures: []

UnitySDK/Assets/ML-Agents/Examples/Basic/Brains.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Basic/Brains/BasicLearning.asset

Lines changed: 0 additions & 23 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Basic/Brains/BasicLearning.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Basic/Brains/BasicPlayer.asset

Lines changed: 0 additions & 30 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Basic/Brains/BasicPlayer.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Basic/Prefabs/Basic.prefab

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,17 @@ MonoBehaviour:
907907
m_Script: {fileID: 11500000, guid: 624480a72e46148118ab2e2d89b537de, type: 3}
908908
m_Name:
909909
m_EditorClassIdentifier:
910-
brain: {fileID: 11400000, guid: e5cf0e35e16264ea483f8863e5115c3c, type: 2}
910+
m_BrainParameters:
911+
vectorObservationSize: 20
912+
numStackedVectorObservations: 1
913+
vectorActionSize: 03000000
914+
cameraResolutions: []
915+
vectorActionDescriptions: []
916+
vectorActionSpaceType: 0
917+
m_Model: {fileID: 11400000, guid: 53fa7c392ce3c492281be273668f6aaf, type: 3}
918+
m_InferenceDevice: 0
919+
m_UseHeuristic: 0
920+
m_BehaviorName: Basic
911921
agentParameters:
912922
agentCameras: []
913923
agentRenderTextures: []

UnitySDK/Assets/ML-Agents/Examples/Basic/Scripts/BasicAgent.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,19 @@ public override void AgentReset()
7373
largeGoal.transform.position = new Vector3(m_LargeGoalPosition - 10f, 0f, 0f);
7474
}
7575

76+
public override float[] Heuristic()
77+
{
78+
if (Input.GetKey(KeyCode.D))
79+
{
80+
return new float[] { 2 };
81+
}
82+
if (Input.GetKey(KeyCode.A))
83+
{
84+
return new float[] { 1 };
85+
}
86+
return new float[] { 0 };
87+
}
88+
7689
public override void AgentOnDone()
7790
{
7891
}

UnitySDK/Assets/ML-Agents/Examples/Bouncer/Brains.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Bouncer/Brains/BouncerLearning.asset

Lines changed: 0 additions & 25 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Bouncer/Brains/BouncerLearning.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Bouncer/Brains/BouncerPlayer.asset

Lines changed: 0 additions & 41 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Bouncer/Brains/BouncerPlayer.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Bouncer/Prefabs/Environment.prefab

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,17 @@ MonoBehaviour:
826826
m_Script: {fileID: 11500000, guid: 0f09741cbce2e44bc88d3e92917eea0e, type: 3}
827827
m_Name:
828828
m_EditorClassIdentifier:
829-
brain: {fileID: 11400000, guid: 573920e3a672d40038169c7ffdbdca05, type: 2}
829+
m_BrainParameters:
830+
vectorObservationSize: 6
831+
numStackedVectorObservations: 3
832+
vectorActionSize: 03000000
833+
cameraResolutions: []
834+
vectorActionDescriptions: []
835+
vectorActionSpaceType: 1
836+
m_Model: {fileID: 11400000, guid: f5250a39cb2134db49b833e3c92527a1, type: 3}
837+
m_InferenceDevice: 0
838+
m_UseHeuristic: 0
839+
m_BehaviorName: Bouncer
830840
agentParameters:
831841
agentCameras: []
832842
agentRenderTextures: []

UnitySDK/Assets/ML-Agents/Examples/Bouncer/Scripts/BouncerAgent.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,16 @@ private void FixedUpdate()
104104
}
105105
}
106106

107+
public override float[] Heuristic()
108+
{
109+
var action = new float[3];
110+
111+
action[0] = Input.GetAxis("Horizontal");
112+
action[1] = Input.GetKey(KeyCode.Space) ? 1.0f : 0.0f;
113+
action[2] = Input.GetAxis("Vertical");
114+
return action;
115+
}
116+
107117
private void Update()
108118
{
109119
if (m_LookDir.magnitude > float.Epsilon)

UnitySDK/Assets/ML-Agents/Examples/Crawler/Brains.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Crawler/Brains/CrawlerDynamicLearning.asset

Lines changed: 0 additions & 42 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Crawler/Brains/CrawlerDynamicLearning.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Crawler/Brains/CrawlerStaticLearning.asset

Lines changed: 0 additions & 42 deletions
This file was deleted.

UnitySDK/Assets/ML-Agents/Examples/Crawler/Brains/CrawlerStaticLearning.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)