Including data files from publication

droumis · Apr 10, 2017 · 5142492 · 5142492
1 parent 18a421c
commit 5142492
Show file tree

Hide file tree

Showing 28 changed files with 1,642 additions and 755 deletions.
diff --git a/Analysis.m b/Analysis.m
diff --git a/CIF.m b/CIF.m
@@ -865,7 +865,7 @@ function setHistory(cifObj,histObj)
             spikeTrainColl.setMinTime(lambda.minTime);
             spikeTrainColl.setMaxTime(lambda.maxTime);
         end
-
+         
         function [spikeTrainColl, lambda]=simulateCIFByThinning(mu,hist,stim,ens,inputStimSignal,inputEnsSignal,numRealizations,simType)
             % spikeTrainColl=simulateCIF(mu,hist,stim,inputStimSignal,inputEnsSignal,numRealizations)
             % Returns a nstColl with numRealization different nspikeTrain

diff --git a/ConfigColl.m b/ConfigColl.m
@@ -149,6 +149,12 @@ function setConfigNames(tcColl, names, index)
                end
            end
        end
+       function subsetConfigs=getSubsetConfigs(tcColl, subset)
+           for i=1:length(subset)
+               tempconfigs{i} = tcColl.getConfig(subset(i));
+           end
+           subsetConfigs=ConfigColl(tempconfigs);
+       end
        function structure = toStructure(tcColl)
           fNames = fieldnames(tcColl); 
           for i=1:length(fNames)

diff --git a/CovColl.m b/CovColl.m
@@ -492,9 +492,10 @@ function enforceSampleRate(ccObj)
             % enforceSampleRate(ccObj) 
             % makes sure that all covariates have the same sampleRate as
             % that in ccObj.sampleRate;
+            currRate = ccObj.sampleRate;
             for i=1:ccObj.numCov;
                 currCov = ccObj.covArray{i}; %change the actual sample rate of the objects
-                if(and(and(round(currCov.sampleRate*1000)/1000~=round(ccObj.sampleRate*1000)/1000,~isnan(currCov.sampleRate)),~isnan(ccObj.sampleRate)))
+                if(and(and(round(currCov.sampleRate*currRate)/currRate~=round(ccObj.sampleRate*currRate)/currRate,~isnan(currCov.sampleRate)),~isnan(ccObj.sampleRate)))
                    currCov.resampleMe(ccObj.sampleRate);
                 end
             end
@@ -590,7 +591,13 @@ function resetCovShift(ccObj)
             dimTot = sumDimensions(selectorCell);
             nCov   = numActCov(selectorCell);
             covInd = covIndFromSelector(selectorCell);
-
+            maxTime=ccObj.getCov(1).maxTime;
+
+            minTime=ccObj.getCov(1).minTime;
+
+            binwidth=1/ccObj.getCov(1).sampleRate;
+
+%             dataMat=zeros(floor(abs(maxTime-minTime)/binwidth)+1,dimTot);
             dataMat=zeros(length(ccObj.getCov(1).getSigRep.time),dimTot);
 %             size(dataMat)
             for i=1:nCov