Aim1

[racheldenison]

should we merge?

[hsinhungli]

This looks fine. The only code related to my model is n_model.m
https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-6 (6) and
the changes are OK.

On Sun, Nov 1, 2015 at 11:47 AM, racheldenison notifications@github.com
wrote:

should we merge?

You can view, comment on, or merge this pull request online at:

#1
Commit Summary

• assigning aKernel in parameters script instead of n_model.m
• added *~ to gitignore
• added TA versions of several scripts, for running temporal attention
  simulations on a simple version of the model. model now includes h
  (suppressive component of involuntary attention), voluntary attention, and
  temporal filtering of the excitatory input.
• added functions for running and plotting multiple endo and soa
  conditions
• added cascades, evidence ceiling, temporal filter on output before
  accumulation (filtered timeseries is r2). tweaked params. this simulation
  reproduces Model 1 results from previous TA simulations.
• working version of Aim 1 model, can simulate exo and endo attention
  to one feature (here standing in for spatial location)
• running endo and exo TA simulations using these settings. main
  script is runModelTA.m
• running simulations

File Changes

• M .gitignore
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-0
  (1)
• A accumulateTA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-1
  (70)
• A cascadeExp.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-2
  (9)
• A initTimeSeriesFA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-3
  (19)
• A initTimeSeriesTA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-4
  (19)
• A makeBiphasic.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-5
  (3)
• M n_model.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-6
  (6)
• A n_model_FA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-7
  (84)
• A n_model_TA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-8
  (71)
• A plotFA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-9
  (47)
• A plotFA2.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-10
  (62)
• A plotPerformanceTA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-11
  (88)
• A plotTA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-12
  (106)
• A runModelFA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-13
  (102)
• A runModelTA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-14
  (103)
• A setParametersFA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-15
  (64)
• A setParametersTA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-16
  (53)
• A setStimFA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-17
  (22)
• A setStimTA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-18
  (23)
• A setTaskFA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-19
  (33)
• A setTaskTA.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-20
  (34)
• A testCascadeExp.m
  https://github.com/hsinhungli/AttentionDynamic/pull/1/files#diff-21
  (50)

Patch Links:

• https://github.com/hsinhungli/AttentionDynamic/pull/1.patch
• https://github.com/hsinhungli/AttentionDynamic/pull/1.diff

—
Reply to this email directly or view it on GitHub
#1.

Hsin-Hung Li
Graduate Student
Department of Psychology
New York University
hsin.hung.li@nyu.edu
hsinhungli@gmail.com