Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Docs/project/more fixes #544

Merged
merged 46 commits into from
Nov 18, 2017
Merged

Docs/project/more fixes #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
c7ac4f3
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Sep 14, 2017
1f6957f
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Sep 18, 2017
e6ab9b5
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Sep 18, 2017
1e985b5
-
jdcpni Sep 19, 2017
dc4e015
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Sep 19, 2017
315ae1b
-
jdcpni Sep 19, 2017
1779029
• System
jdcpni Sep 20, 2017
cfa1b2c
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Sep 20, 2017
8df72ab
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Sep 25, 2017
8c44c04
-
jdcpni Sep 25, 2017
c26b55c
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Oct 5, 2017
0c1d5cc
-
jdcpni Oct 5, 2017
5009fe5
-
jdcpni Oct 13, 2017
0878b01
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Oct 13, 2017
55d8a6a
• System
jdcpni Oct 13, 2017
d5754e8
Merge branch 'devel' into devel
jdcpni Oct 13, 2017
e725a33
-
jdcpni Nov 4, 2017
cb04745
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 5, 2017
ea3b359
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 9, 2017
0c24e98
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 9, 2017
7b545b4
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 9, 2017
d5d6d6d
• State
jdcpni Nov 12, 2017
5c0c9da
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 14, 2017
1bde88c
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 14, 2017
6ec0988
-
jdcpni Nov 14, 2017
7a5b0fe
-
jdcpni Nov 14, 2017
fdf89e6
• State
Nov 14, 2017
decf6d0
-
jdcpni Nov 14, 2017
c8343ed
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 17, 2017
568caa1
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 17, 2017
c62274c
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 17, 2017
865c64c
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 17, 2017
bf14c25
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Nov 17, 2017
ab2dd42
- JDC final changes
jdcpni Nov 17, 2017
7f4d63d
-
jdcpni Nov 17, 2017
b63d60a
-
jdcpni Nov 17, 2017
92de4b4
-
jdcpni Nov 17, 2017
8580fe2
-
jdcpni Nov 17, 2017
772263f
-
jdcpni Nov 17, 2017
1e9b55a
-
jdcpni Nov 17, 2017
6b56dd2
• Project
jdcpni Nov 17, 2017
9f64866
Merge branches 'devel' and 'docs/project/fixes' of https://github.com…
jdcpni Nov 17, 2017
37f4dbe
-
jdcpni Nov 17, 2017
e02806e
Merge branch 'devel' of https://github.com/jdcpni/PsyNeuLink into doc…
jdcpni Nov 17, 2017
bd6e8e4
• Project
jdcpni Nov 17, 2017
4d107d8
Merge branch 'devel' into docs/project/more_fixes
jdcpni Nov 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/runConfigurations/AGT_Test_Script.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/DDM_Learning_Test.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/EVC_Gratton_Script___SEBASTIAN.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_DEBUGGING.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .../runConfigurations/EVC_System_Laming_Validation_Test_Script__SPECIFY_ControlSignals__.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_with_Custom_Fn.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/EVC_System_Test_Script_with_Profiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/FinalProject.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/GilzenratModel.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Make_HTML.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Multilayer_Learning_Test_Script_VARIATIONS.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Multilayer_Learning_Test_Script__WITH_GATING_.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/NEW_Learning_Markus.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/NetworkX_Examples.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Profile_EVC_System_Test.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Stroop_Model_Learning_and_Control_Test_Script.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Stroop_Model_Test_Script_VARIATIONS.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Two_Layer_Test_Script.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Xor_Script_1_process_working.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Xor_Script_2_processes.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_DDM_Test_Script.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_DDM_scheduled_simple.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Documentation_Examples.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_EVC_System_DEMO_Script.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_EVC_System_Laming_Validation_Test_Script.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Integrator_scheduled_timescales.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_META_TEST.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Mixed_NN___DDM_DEMO_Script.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Multilayer_Learning_Test_Script_DEMO.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Scratch_Pad.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Stroop_Demo_Script.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_Stroop_Model_Test.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_System_Graph_and_Input_Test.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/_System_Learning_Test_Script.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading