blank settings in CSV are not assigned

Author: jackbrookes

Assets/UXF/Scripts/Etc/SessionExtensions.cs

@@ -9,7 +9,13 @@ namespace UXF
     public static class SessionExtensions
     {
 
-        public static void TryBuildFromTable(this Session session, UXFDataTable table)
+        /// <summary>
+        /// Build the experiment using a UXFDataTable. 
+        /// The table is used to generate trials row-by-row, assigning a setting per column.
+        /// </summary>
+        /// <param name="session"></param>
+        /// <param name="table"></param>
+        public static void BuildFromTable(this Session session, UXFDataTable table)
         {
             if (table == null) throw new ArgumentNullException("table");
             if (session == null) throw new ArgumentNullException("session");
@@ -51,7 +57,13 @@ public static void TryBuildFromTable(this Session session, UXFDataTable table)
                 // add all the columns to the settings for the trial
                 foreach (var kvp in row)
                 {
+                    // skip block_num
                     if (kvp.Key == "block_num") continue;
+
+                    // empty values do not assign a setting
+                    if (kvp.Value.ToString() == string.Empty) continue;
+
+                    // add trial setting                    
                     newTrial.settings.SetValue(kvp.Key, kvp.Value);
                 }
 

Assets/UXF/Scripts/SessionBuilders/CSVExperimentBuilder.cs

@@ -45,7 +45,7 @@ public void BuildExperiment(Session session)
             // this adds a new trial to the session for each row in the table
             // the trial will be created with the settings from the values from the table
             // if "block_num" is specified in the table, the trial will be added to the block with that number
-            session.TryBuildFromTable(table);
+            session.BuildFromTable(table);
         }
     }
 

Assets/UXF/Tests/Editor/TestBuildingFromCSV.cs

@@ -127,6 +127,39 @@ public void BuildTableFromCSV()
 			}            
         }
 
+        [Test]
+        public void BuildFromTableWithBlankEntries()
+        {
+            UXFDataTable table = new UXFDataTable("some_text");
+
+            var row1 = new UXFDataRow();
+            row1.Add(("some_text", "trial_string"));
+            table.AddCompleteRow(row1);
+
+            var row2 = new UXFDataRow();
+            row2.Add(("some_text", "")); // blank entry
+            table.AddCompleteRow(row2);
+            
+            session.BuildFromTable(table);
+
+            // set a session setting. session needs to be started to create session settings
+            session.Begin("test", "test_ppid");
+            session.settings.SetValue("some_text", "session_string");
+
+            // should be 2 trials
+            Assert.AreEqual(2, session.Trials.Count());
+
+            // pull out the text
+            string trial1text = session.GetTrial(1).settings.GetString("some_text");
+            string trial2text = session.GetTrial(2).settings.GetString("some_text");
+
+            // check that the trial setting is correct
+            Assert.AreEqual("trial_string", trial1text);
+
+            // check that the blank entry was ignored in place of the session setting
+            Assert.AreEqual("session_string", trial2text);
+        }
+
     }
 
 }