From d5c49fa254c9484b205be94d9de2b8d6cdbd143d Mon Sep 17 00:00:00 2001
From: isabellwhiteley <36509025+isabellwhiteley@users.noreply.github.com>
Date: Thu, 15 Feb 2018 17:41:54 +0000
Subject: [PATCH 1/2] i split the experiemtn yaya

---
 splitData.m | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/splitData.m b/splitData.m
index ccd8595..8ec771e 100644
--- a/splitData.m
+++ b/splitData.m
@@ -1,6 +1,21 @@
 function [ control, test ] = splitData( dataSet )
 %SPLITDATA splits a standard AutonoMouse data set into two structures, one
 %for control animals, one for test animals based on NMDA parameter
+control = struct();
+test = struct();
 
+mouseNames = fieldnames(dataSet);
+
+for m = 1:length(mouseNames)
+    thisMouse = dataSet.(mouseNames{m});
+    if thisMouse.NMDA > 0;
+        test.(mouseNames{m})= thisMouse;
+        
+    else
+        control.(mouseNames{m})= thisMouse;
+    end
+end
+
+    
 end
 

From 6e8b17db667144c0af97ba822f183d0b6ea009be Mon Sep 17 00:00:00 2001
From: isabellwhiteley <36509025+isabellwhiteley@users.noreply.github.com>
Date: Thu, 15 Feb 2018 17:57:21 +0000
Subject: [PATCH 2/2] Merge remote-tracking branch 'upstream/master'

---
 getParameters.m | 19 +++++++++++++++++++
 splitData.m     |  9 ++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/getParameters.m b/getParameters.m
index 86e32fa..41931b8 100644
--- a/getParameters.m
+++ b/getParameters.m
@@ -3,5 +3,24 @@
 %parameters for a given trial where each row is an individual animal and
 %each column is the chosen parameter on each trial
 
+mouseNames = fieldnames(dataSet);
+
+allParameters = {};
+
+for m = 1:length(mouseNames)
+   thisMouse = dataSet.(mouseNames{m});
+   thisTask = thisMouse.(task);
+   thisParameter = thisTask.(parameter);
+   
+   allParameters{m} = thisParameter;
+end
+
+maxLength = max(cellfun(@length, allParameters));
+parameters = nan(length(allParameters), maxLength);
+
+for i = 1:length(allParameters)
+   parameters(i,1:length(allParameters{1,i})) = allParameters{1,i}; 
+end
+
 end
 
diff --git a/splitData.m b/splitData.m
index 8ec771e..77c6f70 100644
--- a/splitData.m
+++ b/splitData.m
@@ -8,14 +8,13 @@
 
 for m = 1:length(mouseNames)
     thisMouse = dataSet.(mouseNames{m});
-    if thisMouse.NMDA > 0;
-        test.(mouseNames{m})= thisMouse;
-        
+    
+    if thisMouse.NMDA > 0
+        test.(mouseNames{m}) = thisMouse;
     else
-        control.(mouseNames{m})= thisMouse;
+        control.(mouseNames{m}) = thisMouse;
     end
 end
 
-    
 end