merge serialization array change

Author: aryan-mann

com.unity.perception/CHANGELOG.md

@@ -35,6 +35,8 @@ Upgraded capture package dependency to 0.0.10-preview.24. This fixes an issue wh
 
 Changed the JSON serialization key of Normal Sampler's standard deviation property from "standardDeviation" to "stddev".
 
+Changed the JSON serialization of Randomizers in a scenario to an array of groups rather than a dictionary.
+
 ### Deprecated
 
 ### Removed

com.unity.perception/Runtime/Randomization/Scenarios/Serialization/ScenarioSerializer.cs

@@ -50,19 +50,20 @@ static TemplateConfigurationOptions SerializeScenarioToTemplate(ScenarioBase sce
         {
             return new TemplateConfigurationOptions
             {
-                groups = SerializeRandomizers(scenario.randomizers)
+                randomizerGroups = SerializeRandomizers(scenario.randomizers)
             };
         }
 
-        static Dictionary<string, Group> SerializeRandomizers(IEnumerable<Randomizer> randomizers)
+        static List<Group> SerializeRandomizers(IEnumerable<Randomizer> randomizers)
         {
-            var serializedRandomizers = new Dictionary<string, Group>();
+            var serializedRandomizers = new List<Group>();
             foreach (var randomizer in randomizers)
             {
                 var randomizerData = SerializeRandomizer(randomizer);
                 if (randomizerData.items.Count == 0 && !randomizerData.state.canBeSwitchedByUser)
                     continue;
-                serializedRandomizers.Add(randomizer.GetType().Name, randomizerData);
+
+                serializedRandomizers.Add(randomizerData);
             }
             return serializedRandomizers;
         }
@@ -77,6 +78,7 @@ static Group SerializeRandomizer(Randomizer randomizer)
             };
 
             var fields = randomizer.GetType().GetFields();
+            randomizerData.randomizerId = randomizer.GetType().Name;
             foreach (var field in fields)
             {
                 if (field.FieldType.IsSubclassOf(typeof(Randomization.Parameters.Parameter)))
@@ -214,21 +216,21 @@ static void DeserializeConstants(ScenarioConstants constants, JObject constantsD
 
         static void DeserializeTemplateIntoScenario(ScenarioBase scenario, TemplateConfigurationOptions template)
         {
-            DeserializeRandomizers(scenario.randomizers, template.groups);
+            DeserializeRandomizers(scenario.randomizers, template.randomizerGroups);
         }
 
-        static void DeserializeRandomizers(IEnumerable<Randomizer> randomizers, Dictionary<string, Group> groups)
+        static void DeserializeRandomizers(IEnumerable<Randomizer> randomizers, List<Group> groups)
         {
             var randomizerTypeMap = new Dictionary<string, Randomizer>();
             foreach (var randomizer in randomizers)
                 randomizerTypeMap.Add(randomizer.GetType().Name, randomizer);
 
-            foreach (var randomizerPair in groups)
+            foreach (var randomizerData in groups)
             {
-                if (!randomizerTypeMap.ContainsKey(randomizerPair.Key))
+                if (!randomizerTypeMap.ContainsKey(randomizerData.randomizerId))
                     continue;
-                var randomizer = randomizerTypeMap[randomizerPair.Key];
-                DeserializeRandomizer(randomizer, randomizerPair.Value);
+                var randomizer = randomizerTypeMap[randomizerData.randomizerId];
+                DeserializeRandomizer(randomizer, randomizerData);
             }
         }
 

com.unity.perception/Runtime/Randomization/Scenarios/Serialization/SerializationStructures.cs

@@ -16,7 +16,7 @@ interface IScalarValue { }
     #region GroupedObjects
     class TemplateConfigurationOptions
     {
-        public Dictionary<string, Group> groups = new Dictionary<string, Group>();
+        public List<Group> randomizerGroups = new List<Group>();
     }
 
     class StandardMetadata
@@ -40,6 +40,7 @@ class Limits
 
     class Group
     {
+        public string randomizerId;
         public StandardMetadata metadata = new StandardMetadata();
         public RandomizerStateData state = null;
         [JsonConverter(typeof(GroupItemsConverter))]

com.unity.perception/Tests/Runtime/Randomization/ScenarioTests/Resources/SampleScenarioConfiguration.json

@@ -7,8 +7,9 @@
     "randomSeed": 539662031
   },
   "randomizers": {
-    "groups": {
-      "RotationRandomizer": {
+    "randomizerGroups": [
+      {
+        "randomizerId": "RotationRandomizer",
         "metadata": {
           "name": "",
           "description": "",
@@ -71,6 +72,6 @@
           }
         }
       }
-    }
+    ]
   }
 }