Merge pull request #561 from PrincetonUniversity/devel

Devel
PrincetonUniversity · Dec 1, 2017 · bfcc696 · bfcc696
2 parents 3607334 + 5a35c4a
commit bfcc696
Show file tree

Hide file tree

Showing 13 changed files with 2,517 additions and 197 deletions.
diff --git a/Scripts/Models/GilzenratModel.py b/Scripts/Models/GilzenratModel.py
@@ -19,7 +19,7 @@
 
 # Weights & Biases:
 b_decision = 0.00   # Bias on decision units (not biased)
-b_response = 2.00  # Bias on response unit --- NOTE: Gilzenrat has negative signs in his logistic equation
+b_response = 2.00   # Bias on response unit --- NOTE: Gilzenrat has negative signs in his logistic equation
 w_XiIi = 1.00       # Connection weight from input units I1 and I2 to respective decision units X1 and X2
 w_XiIj = 0.33       # Cross talk weight from input unit to opposite decision unit
 w_XiXi = 1.00       # Recurrent self-connection weight for both decision units

diff --git a/docs/build/html/_static/gilzenrat_matlab.svg b/docs/build/html/_static/gilzenrat_matlab.svg