diff --git a/Assets/Brains/CozmoLearningBrain.nn b/Assets/Brains/1_original_trained_brain.nn similarity index 100% rename from Assets/Brains/CozmoLearningBrain.nn rename to Assets/Brains/1_original_trained_brain.nn diff --git a/Assets/Brains/CozmoLearningBrain.nn.meta b/Assets/Brains/1_original_trained_brain.nn.meta similarity index 69% rename from Assets/Brains/CozmoLearningBrain.nn.meta rename to Assets/Brains/1_original_trained_brain.nn.meta index 04f19b2..6b06505 100644 --- a/Assets/Brains/CozmoLearningBrain.nn.meta +++ b/Assets/Brains/1_original_trained_brain.nn.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 24baaa8c605c1a74785880885cf04847 +guid: 7404b992c6519d54c96c3489d921d0c1 ScriptedImporter: fileIDToRecycleName: - 11400000: Assets/Brains/CozmoLearningBrain.nn + 11400000: Assets/Brains/1_original_trained_brain.nn externalObjects: {} userData: assetBundleName: diff --git a/Assets/Brains/CozmoLearningBrain_cozmo_training-0.nn b/Assets/Brains/2_modified_turnspeed_actionmask_brain.nn similarity index 100% rename from Assets/Brains/CozmoLearningBrain_cozmo_training-0.nn rename to Assets/Brains/2_modified_turnspeed_actionmask_brain.nn diff --git a/Assets/Brains/2_modified_turnspeed_actionmask_brain.nn.meta b/Assets/Brains/2_modified_turnspeed_actionmask_brain.nn.meta new file mode 100644 index 0000000..374bb42 --- /dev/null +++ b/Assets/Brains/2_modified_turnspeed_actionmask_brain.nn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 95b359f17fe8fba4f8564c236b378d66 +ScriptedImporter: + fileIDToRecycleName: + 11400000: Assets/Brains/2_modified_turnspeed_actionmask_brain.nn + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 83221ad3db87f4b3b91b041047cb2bc5, type: 3} diff --git a/Assets/Brains/3_modified_actionmask_memory_3_brain.nn b/Assets/Brains/3_modified_actionmask_memory_3_brain.nn new file mode 100644 index 0000000..16ba6ed Binary files /dev/null and b/Assets/Brains/3_modified_actionmask_memory_3_brain.nn differ diff --git a/Assets/Brains/CozmoLearningBrain_cozmo_training-0.nn.meta b/Assets/Brains/3_modified_actionmask_memory_3_brain.nn.meta similarity index 67% rename from Assets/Brains/CozmoLearningBrain_cozmo_training-0.nn.meta rename to Assets/Brains/3_modified_actionmask_memory_3_brain.nn.meta index 6a76c82..2597a5a 100644 --- a/Assets/Brains/CozmoLearningBrain_cozmo_training-0.nn.meta +++ b/Assets/Brains/3_modified_actionmask_memory_3_brain.nn.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 7f8f0f4568060e84bb933886fd122e7e +guid: af2054fbe8d1d9244a9dc1f5e1af9e47 ScriptedImporter: fileIDToRecycleName: - 11400000: Assets/Brains/CozmoLearningBrain_cozmo_training-0.nn + 11400000: Assets/Brains/3_modified_actionmask_memory_3_brain.nn externalObjects: {} userData: assetBundleName: diff --git a/Assets/Brains/4_modified_actionmask_memory_5_brain.nn b/Assets/Brains/4_modified_actionmask_memory_5_brain.nn new file mode 100644 index 0000000..ff099ff Binary files /dev/null and b/Assets/Brains/4_modified_actionmask_memory_5_brain.nn differ diff --git a/Assets/Brains/CozmoTrainedBrain.nn.meta b/Assets/Brains/4_modified_actionmask_memory_5_brain.nn.meta similarity index 67% rename from Assets/Brains/CozmoTrainedBrain.nn.meta rename to Assets/Brains/4_modified_actionmask_memory_5_brain.nn.meta index 92289b8..71ec104 100644 --- a/Assets/Brains/CozmoTrainedBrain.nn.meta +++ b/Assets/Brains/4_modified_actionmask_memory_5_brain.nn.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: c9717311ba788544a9b6db7dd147300d +guid: bedf7a4d1127eb74bbf17c848a8f5ad8 ScriptedImporter: fileIDToRecycleName: - 11400002: Assets/Brains/CozmoTrainedBrain.nn + 11400000: Assets/Brains/4_modified_actionmask_memory_5_brain.nn externalObjects: {} userData: assetBundleName: diff --git a/Assets/Brains/CozmoLearningBrain.asset b/Assets/Brains/CozmoLearningBrain.asset index d9861a5..dc35d8e 100644 --- a/Assets/Brains/CozmoLearningBrain.asset +++ b/Assets/Brains/CozmoLearningBrain.asset @@ -23,5 +23,5 @@ MonoBehaviour: vectorActionDescriptions: - vectorActionSpaceType: 0 - model: {fileID: 11400000, guid: 7f8f0f4568060e84bb933886fd122e7e, type: 3} + model: {fileID: 11400000, guid: 7404b992c6519d54c96c3489d921d0c1, type: 3} inferenceDevice: 0 diff --git a/Assets/Brains/CozmoTrainedBrain.nn b/Assets/Brains/CozmoTrainedBrain.nn deleted file mode 100644 index d278e9a..0000000 Binary files a/Assets/Brains/CozmoTrainedBrain.nn and /dev/null differ diff --git a/Assets/Scenes/CozmoTraining.unity b/Assets/Scenes/CozmoTraining.unity index af17fef..32b5bc0 100644 --- a/Assets/Scenes/CozmoTraining.unity +++ b/Assets/Scenes/CozmoTraining.unity @@ -708,8 +708,6 @@ MonoBehaviour: - {fileID: 774534267} - {fileID: 380448016} - {fileID: 1159195260} - - {fileID: 0} - - {fileID: 0} --- !u!4 &776834971 Transform: m_ObjectHideFlags: 0 @@ -942,7 +940,6 @@ MonoBehaviour: - {fileID: 11400000, guid: 0d9d5ce547064a648b466ad7f208cf3d, type: 2} _brainsToControl: - {fileID: 0} - - {fileID: 11400000, guid: 0d9d5ce547064a648b466ad7f208cf3d, type: 2} maxSteps: 1500 trainingConfiguration: width: 80 diff --git a/Assets/Scripts/ML Cozmo/CozmoAgent.cs b/Assets/Scripts/ML Cozmo/CozmoAgent.cs index 4e3f44a..20bcdb1 100644 --- a/Assets/Scripts/ML Cozmo/CozmoAgent.cs +++ b/Assets/Scripts/ML Cozmo/CozmoAgent.cs @@ -126,7 +126,7 @@ namespace Cozmo public override void AgentAction(float[] vectorAction, string textAction) { double elapsedTime = Time.time - startTime; - print("Elapsed time: " + elapsedTime); + //Debug.Log("Elapsed time: " + elapsedTime); startTime = Time.time; int action = Mathf.FloorToInt(vectorAction[0]);