Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
* devel:
  utilities: enhance method to recursively convert items to np.ndarray, handling hard cases for np.array
  remove scratch pad and ignore
  Docs/log/log clean up (#593)
  Docs/log/log clean up (#592)
  remove scratch pad
  Docs/log/log clean up (#591)
  Names/log/set log conditions (#590)
  adding pytests to verify that threshold and is_finished work as expected; commenting out tests with DriftDiffusionIntegrator and len(default_variable) > 1 because correct behavior is ambiguous (for now)
  adding 'threshold' param on DriftDiffusionIntegrator which stops accumulation at the threshold, and updated DDM's is_finished to look at this
  add realtime timestamps to Scheduler, for creation time and end of last RUN time
  change usages of now defunct times attribute of Schedulers to new version
  Bugfixes (#588)
  Feat/log/add entry (#587)
  Fix/log/log initialization (#586)
  Feat/log/clean up (#585)
  Feat/log/clean up (#584)
  Feat/feat log with time (#583)
  rename psyneulink.scheduling.timescale -> psyneulink.scheduling.time
  create and integrate a new Clock class, and several new classes to keep time, used in Scheduler and Conditions
  remove old Clock/CentralClock
  Feat/log/log levels (#580)
  test
  Refactor/log/entry management (#579)
  Docs/log/docstring update (#578)
  Add integrator function tests
  Add transfer function tests
  Add distance function tests
  function: test for both 1d and 2d noise
  setup.cfg: Use warmup if benchmarks are enabled
  setup.cfg: Disable benchmarks by default
  pytest: Add benchmarking plugin
  Fix/log/logged items bug (#577)
  using UniformToNormalDist pytest as a check of the scipy requirement error message
  adding documentation for UniformToNormalDist
  validating uniform-to-normal distribution function (matlab)
  Docs/log/docstring update (#572)
  adding gilzenrat figures in _build file
  adding pytest file for parameter states
  Name/log/numpy array to nparray (#571)
  Feat/mechanism/additional props (#570)
  Feat/log (#569)
  EVCAuxiliary: replace kwargs function signatures with explicit arguments
  add docstring explanation for processing and learning termination conditions
  Feat/log (#568)
  adding LC Control Mechanism test to verify that it is updating multiplicative param(s) of modulated mechanism(s) properly
  fix incorrect construction of Process and System in Multitasking example script
  Feat/log (#565)
  Feat/log (#564)
  adding a pytest for the new uniform --> normal distribution function
  adding new UniformToNormalDist function which allows for a direct comparison of random numbers between python and matlab
  • Loading branch information
kmantel committed Dec 13, 2017
2 parents 98367cb + 6c3760e commit fb53232
Show file tree
Hide file tree
Showing 138 changed files with 5,478 additions and 2,078 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,5 @@ ENV/
/site

# End of https://www.gitignore.io/api/osx,python,pycharm

Scripts/Scratch\ Pad.py
20 changes: 0 additions & 20 deletions .idea/runConfigurations/AGT_Test_Script.xml

This file was deleted.

21 changes: 0 additions & 21 deletions .idea/runConfigurations/DDM_Learning_Test.xml

This file was deleted.

22 changes: 0 additions & 22 deletions .idea/runConfigurations/EVC_Gratton_Script___SEBASTIAN.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

21 changes: 0 additions & 21 deletions .idea/runConfigurations/EVC_System_Test_Script_with_Profiler.xml

This file was deleted.

This file was deleted.

This file was deleted.

22 changes: 0 additions & 22 deletions .idea/runConfigurations/NEW_Learning_Markus.xml

This file was deleted.

21 changes: 0 additions & 21 deletions .idea/runConfigurations/NetworkX_Examples.xml

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/ResetInterpreter.xml

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

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

This file was deleted.

22 changes: 0 additions & 22 deletions .idea/runConfigurations/Stroop_Model_Test_Script_VARIATIONS.xml

This file was deleted.

22 changes: 0 additions & 22 deletions .idea/runConfigurations/Two_Layer_Test_Script.xml

This file was deleted.

Loading

0 comments on commit fb53232

Please sign in to comment.