Updating trial iteration

I think that there's an issue with it figuring out when to iterate to the next hab trial too late, so trying moving that earlier.
jfkominsky · Mar 6, 2024 · 661b333 · 661b333
1 parent 7aedab1
commit 661b333
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/PyHab/PyHabClass.py b/PyHab/PyHabClass.py
@@ -622,12 +622,13 @@ def checkStop(self, blockName):
                 trialPerIter = len(targetTrials)/self.blockList[blockName]['metCritWindow'] # Typically this will be 1
                 currIter = 0
                 for n in range(0, len(targetTrials)):
+                    if n % trialPerIter == 0 and n > 0:
+                        currIter += 1
                     for i in range(0, len(self.verbDatList['verboseOff'])):
                         if self.verbDatList['verboseOff'][i]['trial'] == targetTrials[n]:
                             if self.verbDatList['verboseOff'][i]['duration'] >= self.habCrit[blockName]:
                                 consecPostThreshold[currIter] = 1
-                    if n % trialPerIter == 0 and n > 0:
-                        currIter += 1
+
 
                 if 0 in consecPostThreshold: # It's a slightly weird way to do this but I think it will work.
                     return False

diff --git a/testing/test_pyhab.py b/testing/test_pyhab.py
@@ -1268,12 +1268,12 @@ def test_fixedtriallength(self):
         currIter = 0
 
         for n in range(0, len(targetTrials)):
+            if n % trialPerIter == 0 and n > 0:
+                currIter += 1
             for i in range(0, len(self.dataInst.verbDatList['verboseOff'])):
                 if self.dataInst.verbDatList['verboseOff'][i]['trial'] == targetTrials[n]:
                     if self.dataInst.verbDatList['verboseOff'][i]['duration'] >= self.dataInst.habCrit[blockName]:
                         consecPostThreshold[currIter] = 1
-            if n % trialPerIter == 0 and n > 0:
-                currIter += 1
         assert currIter == 2
         assert consecPostThreshold == [1,1,1]