Merge pull request #392 from NVlabs/TrialLevelConfig

Trial-level configuration
NVlabs · Dec 9, 2022 · 7c0c472 · 7c0c472
2 parents 7a73733 + 41d3c5f
commit 7c0c472
Show file tree

Hide file tree

Showing 25 changed files with 857 additions and 542 deletions.
diff --git a/data-files/samples/sa2019_1hit.Experiment.Any b/data-files/samples/sa2019_1hit.Experiment.Any
@@ -65,11 +65,11 @@
             frameDelay = 0;
             blockCount = 10;
             trials = (
-                {ids = ("static"), count = 3},
-                {ids = ("straight_fly"), count = 3},
-                {ids = ("stray_fly_easy"), count = 4},
-                {ids = ("stray_fly_hard"), count = 4},
-                {ids = ("strafe_jump"), count = 8}
+                {targetIds = ("static"), count = 3},
+                {targetIds = ("straight_fly"), count = 3},
+                {targetIds = ("stray_fly_easy"), count = 4},
+                {targetIds = ("stray_fly_hard"), count = 4},
+                {targetIds = ("strafe_jump"), count = 8}
             );
         },
         {
@@ -78,11 +78,11 @@
             frameDelay = 2;
             blockCount = 10;
             trials = (
-                {ids = ("static"), count = 3},
-                {ids = ("straight_fly"), count = 3},
-                {ids = ("stray_fly_easy"), count = 4},
-                {ids = ("stray_fly_hard"), count = 4},
-                {ids = ("strafe_jump"), count = 8}
+                {targetIds = ("static"), count = 3},
+                {targetIds = ("straight_fly"), count = 3},
+                {targetIds = ("stray_fly_easy"), count = 4},
+                {targetIds = ("stray_fly_hard"), count = 4},
+                {targetIds = ("strafe_jump"), count = 8}
             );
         },
         {
@@ -91,11 +91,11 @@
             frameDelay = 0;
             blockCount = 10;
             trials = (
-                {ids = ("static"), count = 3},
-                {ids = ("straight_fly"), count = 3},
-                {ids = ("stray_fly_easy"), count = 4},
-                {ids = ("stray_fly_hard"), count = 4},
-                {ids = ("strafe_jump"), count = 8}
+                {targetIds = ("static"), count = 3},
+                {targetIds = ("straight_fly"), count = 3},
+                {targetIds = ("stray_fly_easy"), count = 4},
+                {targetIds = ("stray_fly_hard"), count = 4},
+                {targetIds = ("strafe_jump"), count = 8}
             );
         },
         {
@@ -104,11 +104,11 @@
             frameDelay = 4;
             blockCount = 10;
             trials = (
-                {ids = ("static"), count = 3},
-                {ids = ("straight_fly"), count = 3},
-                {ids = ("stray_fly_easy"), count = 4},
-                {ids = ("stray_fly_hard"), count = 4},
-                {ids = ("strafe_jump"), count = 8}
+                {targetIds = ("static"), count = 3},
+                {targetIds = ("straight_fly"), count = 3},
+                {targetIds = ("stray_fly_easy"), count = 4},
+                {targetIds = ("stray_fly_hard"), count = 4},
+                {targetIds = ("strafe_jump"), count = 8}
             );
         },
         {
@@ -117,11 +117,11 @@
             frameDelay = 0;
             blockCount = 10;
             trials = (
-                {ids = ("static"), count = 3},
-                {ids = ("straight_fly"), count = 3},
-                {ids = ("stray_fly_easy"), count = 4},
-                {ids = ("stray_fly_hard"), count = 4},
-                {ids = ("strafe_jump"), count = 8}
+                {targetIds = ("static"), count = 3},
+                {targetIds = ("straight_fly"), count = 3},
+                {targetIds = ("stray_fly_easy"), count = 4},
+                {targetIds = ("stray_fly_hard"), count = 4},
+                {targetIds = ("strafe_jump"), count = 8}
             );
         },
         {
@@ -130,11 +130,11 @@
             frameDelay = 8;
             blockCount = 10;
             trials = (
-                {ids = ("static"), count = 3},
-                {ids = ("straight_fly"), count = 3},
-                {ids = ("stray_fly_easy"), count = 4},
-                {ids = ("stray_fly_hard"), count = 4},
-                {ids = ("strafe_jump"), count = 8}
+                {targetIds = ("static"), count = 3},
+                {targetIds = ("straight_fly"), count = 3},
+                {targetIds = ("stray_fly_easy"), count = 4},
+                {targetIds = ("stray_fly_hard"), count = 4},
+                {targetIds = ("strafe_jump"), count = 8}
             );
         },
     );

diff --git a/data-files/samples/sa2019_track.Experiment.Any b/data-files/samples/sa2019_track.Experiment.Any
@@ -67,9 +67,9 @@
           frameDelay = 0;
           blockCount = 10;
           trials = (
-              {ids = ("straight_fly"), count = 2},
-              {ids = ("stray_fly_easy"), count = 5},
-              {ids = ("strafe_jump"), count = 5}
+              {targetIds = ("straight_fly"), count = 2},
+              {targetIds = ("stray_fly_easy"), count = 5},
+              {targetIds = ("strafe_jump"), count = 5}
           );
       },
       {
@@ -78,9 +78,9 @@
           frameDelay = 2;
           blockCount = 10;
           trials = (
-              {ids = ("straight_fly"), count = 2},
-              {ids = ("stray_fly_easy"), count = 5},
-              {ids = ("strafe_jump"), count = 5}
+              {targetIds = ("straight_fly"), count = 2},
+              {targetIds = ("stray_fly_easy"), count = 5},
+              {targetIds = ("strafe_jump"), count = 5}
           );
       },
       {
@@ -89,9 +89,9 @@
           frameDelay = 0;
           blockCount = 10;
           trials = (
-              {ids = ("straight_fly"), count = 2},
-              {ids = ("stray_fly_easy"), count = 5},
-              {ids = ("strafe_jump"), count = 5}
+              {targetIds = ("straight_fly"), count = 2},
+              {targetIds = ("stray_fly_easy"), count = 5},
+              {targetIds = ("strafe_jump"), count = 5}
           );
       },
       {
@@ -100,9 +100,9 @@
           frameDelay = 4;
           blockCount = 10;
           trials = (
-              {ids = ("straight_fly"), count = 2},
-              {ids = ("stray_fly_easy"), count = 5},
-              {ids = ("strafe_jump"), count = 5}
+              {targetIds = ("straight_fly"), count = 2},
+              {targetIds = ("stray_fly_easy"), count = 5},
+              {targetIds = ("strafe_jump"), count = 5}
           );
       },
       {
@@ -111,9 +111,9 @@
           frameDelay = 0;
           blockCount = 10;
           trials = (
-              {ids = ("straight_fly"), count = 2},
-              {ids = ("stray_fly_easy"), count = 5},
-              {ids = ("strafe_jump"), count = 5}
+              {targetIds = ("straight_fly"), count = 2},
+              {targetIds = ("stray_fly_easy"), count = 5},
+              {targetIds = ("strafe_jump"), count = 5}
           );
       },
       {
@@ -122,9 +122,9 @@
           frameDelay = 8;
           blockCount = 10;
           trials = (
-              {ids = ("straight_fly"), count = 2},
-              {ids = ("stray_fly_easy"), count = 5},
-              {ids = ("strafe_jump"), count = 5}
+              {targetIds = ("straight_fly"), count = 2},
+              {targetIds = ("stray_fly_easy"), count = 5},
+              {targetIds = ("strafe_jump"), count = 5}
           );
       },
     );

diff --git a/data-files/samples/targetmodels.Experiment.Any b/data-files/samples/targetmodels.Experiment.Any
@@ -19,7 +19,7 @@
             trials = ( 
                 { 
                     count = 20; 
-                    ids = ( "ico"); 
+                    targetIds = ( "ico"); 
                 } 
             ); 
 
@@ -30,7 +30,7 @@
             trials = ( 
                 { 
                     count = 20; 
-                    ids = ( "low"); 
+                    targetIds = ( "low"); 
                 } 
             ); 
 
@@ -41,7 +41,7 @@
             trials = ( 
                 { 
                     count = 20; 
-                    ids = ( "mid", "mid"); 
+                    targetIds = ( "mid", "mid"); 
                 } 
             ); 
 
@@ -52,7 +52,7 @@
             trials = ( 
                 { 
                     count = 20; 
-                    ids = ( "high", "high"); 
+                    targetIds = ( "high", "high"); 
                 } 
             ); 
 
@@ -63,7 +63,7 @@
             trials = ( 
                 { 
                     count = 20; 
-                    ids = ( "cylinder", "cylinder"); 
+                    targetIds = ( "cylinder", "cylinder"); 
                 } 
             ); 
 
@@ -74,7 +74,7 @@
             trials = ( 
                 { 
                     count = 20; 
-                    ids = ( "ico", "low", "mid", "high", "cylinder");
+                    targetIds = ( "ico", "low", "mid", "high", "cylinder");
                 }, 
             ); 
 

diff --git a/data-files/samples/targets.Experiment.Any b/data-files/samples/targets.Experiment.Any
@@ -19,7 +19,7 @@
             trials = ( 
                 { 
                     count = 20; 
-                    ids = ( "static"); 
+                    targetIds = ( "static"); 
                 } 
             ); 
 
@@ -30,7 +30,7 @@
             trials = ( 
                 { 
                     count = 20; 
-                    ids = ( "static", "static"); 
+                    targetIds = ( "static", "static"); 
                 } 
             ); 
 
@@ -41,7 +41,7 @@
             trials = ( 
                 { 
                     count = 20; 
-                    ids = ( "static", "static", "static", "static", "static"); 
+                    targetIds = ( "static", "static", "static", "static", "static"); 
                 } 
             ); 
 
@@ -52,7 +52,7 @@
             trials = ( 
                 { 
                     count = 20; 
-                    ids = ( "moving"); 
+                    targetIds = ( "moving"); 
                 } 
             ); 
 
@@ -63,7 +63,7 @@
             trials = ( 
                 { 
                     count = 20; 
-                    ids = ( "jumping"); 
+                    targetIds = ( "jumping"); 
                 } ); 
 
         }, 
@@ -73,15 +73,15 @@
             trials = ( 
                 { 
                     count = 7; 
-                    ids = ( "static");
+                    targetIds = ( "static");
                 }, 
                 { 
                     count = 7; 
-                    ids = ( "moving");
+                    targetIds = ( "moving");
                 }, 
                 { 
                     count = 6; 
-                    ids = ( "jumping");
+                    targetIds = ( "jumping");
                 }, 
             );