Feat/log/log with time #582

jdcpni · 2017-12-10T03:31:03Z

• Log

integrated with Scheduler and Time modules; now reports run:trial:time_step
nparray, csv: implemented reporting of asynchronous recordings

• Tests

test_log: updated per above
test_multilayer: log testing updated per above

- show_graph(): bug fix for ControlProjections

…parison of random numbers between python and matlab

…Link into feat/normal-dist/matlab

- show_graph(): bug fix for ControlProjections

* • System - show_graph(): fixed bug producing empty image for graphs with just one Mechanism added auto-recurrent projections * • Component - deferred_init: fixed bug in which "Deferred Init" was remaining in name of initialized Component * • Component - added call to _assign_default_name() • PathwayProjection, Projection - added _assign_default_name to trap call from Component * • Component - added call to _assign_default_name() • PathwayProjection, Projection - added _assign_default_name to trap call from Component * • Component - added call to _assign_default_name() • PathwayProjection, Projection - added _assign_default_name to trap call from Component * • Moved call to _assign_default_projection_name from MappingProjection to Projection * • State - _validate_variable: removed: if not context: context = kwAssign + ' Base Value' else: context = context + kwAssign + ' Base Value' * • State - _validate_variable: removed: if not context: context = kwAssign + ' Base Value' else: context = context + kwAssign + ' Base Value' * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • Mechanism - added states and projections properties (as well as ones for each projection time) - added log_items property that returns a list of logged items and allows them to be set • State - fixed a bug preventing proper logging * • Mechanism - added states and projections properties (as well as ones for each projection time) - added log_items property that returns a list of logged items and allows them to be set • State - fixed a bug preventing proper logging * - * - * - * - * - * • README.rst and index.rst: revs to Intro, Purpose, and Contributors * • Mechanism - docstring: updated to include states, and projections attributes * • Mechanism - docstring: updated to include states, and projections attributes * • Mechanism - docstring: updated to include states, and projections attributes * • Mechanism - docstring: updated to include states, and projections attributes * - * - * - * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * - * - * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * - * - * - * - * - * - * - * - * - * - * - * - * -

* • System - show_graph(): fixed bug producing empty image for graphs with just one Mechanism added auto-recurrent projections * • Component - deferred_init: fixed bug in which "Deferred Init" was remaining in name of initialized Component * • Component - added call to _assign_default_name() • PathwayProjection, Projection - added _assign_default_name to trap call from Component * • Component - added call to _assign_default_name() • PathwayProjection, Projection - added _assign_default_name to trap call from Component * • Component - added call to _assign_default_name() • PathwayProjection, Projection - added _assign_default_name to trap call from Component * • Moved call to _assign_default_projection_name from MappingProjection to Projection * • State - _validate_variable: removed: if not context: context = kwAssign + ' Base Value' else: context = context + kwAssign + ' Base Value' * • State - _validate_variable: removed: if not context: context = kwAssign + ' Base Value' else: context = context + kwAssign + ' Base Value' * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • Mechanism - added states and projections properties (as well as ones for each projection time) - added log_items property that returns a list of logged items and allows them to be set • State - fixed a bug preventing proper logging * • Mechanism - added states and projections properties (as well as ones for each projection time) - added log_items property that returns a list of logged items and allows them to be set • State - fixed a bug preventing proper logging * - * - * - * - * - * • README.rst and index.rst: revs to Intro, Purpose, and Contributors * • Mechanism - docstring: updated to include states, and projections attributes * • Mechanism - docstring: updated to include states, and projections attributes * • Mechanism - docstring: updated to include states, and projections attributes * • Mechanism - docstring: updated to include states, and projections attributes * - * - * - * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * - * - * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * - * - * - * - * - * - * - * - * - * - * - * - * - * • Log - added an example to docstring

…ple script

…licative param(s) of modulated mechanism(s) properly

…Link into fix/lc-control-mechanism/modulation

…nism/modulation Fix/lc control mechanism/modulation

* • System - show_graph(): fixed bug producing empty image for graphs with just one Mechanism added auto-recurrent projections * • Component - deferred_init: fixed bug in which "Deferred Init" was remaining in name of initialized Component * • Component - added call to _assign_default_name() • PathwayProjection, Projection - added _assign_default_name to trap call from Component * • Component - added call to _assign_default_name() • PathwayProjection, Projection - added _assign_default_name to trap call from Component * • Component - added call to _assign_default_name() • PathwayProjection, Projection - added _assign_default_name to trap call from Component * • Moved call to _assign_default_projection_name from MappingProjection to Projection * • State - _validate_variable: removed: if not context: context = kwAssign + ' Base Value' else: context = context + kwAssign + ' Base Value' * • State - _validate_variable: removed: if not context: context = kwAssign + ' Base Value' else: context = context + kwAssign + ' Base Value' * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • Mechanism - added states and projections properties (as well as ones for each projection time) - added log_items property that returns a list of logged items and allows them to be set • State - fixed a bug preventing proper logging * • Mechanism - added states and projections properties (as well as ones for each projection time) - added log_items property that returns a list of logged items and allows them to be set • State - fixed a bug preventing proper logging * - * - * - * - * - * • README.rst and index.rst: revs to Intro, Purpose, and Contributors * • Mechanism - docstring: updated to include states, and projections attributes * • Mechanism - docstring: updated to include states, and projections attributes * • Mechanism - docstring: updated to include states, and projections attributes * • Mechanism - docstring: updated to include states, and projections attributes * - * - * - * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * - * - * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * - * - * - * - * - * - * - * - * - * - * - * - * - * • Log - added an example to docstring * - * • Log - docstring: added full example (including logging a MappingProjection) * • Log - docstring: added full example (including logging a MappingProjection) * • Log - docstring: added full example (including logging a MappingProjection)

…ditions

* • System - show_graph(): fixed bug producing empty image for graphs with just one Mechanism added auto-recurrent projections * • Component - deferred_init: fixed bug in which "Deferred Init" was remaining in name of initialized Component * • Component - added call to _assign_default_name() • PathwayProjection, Projection - added _assign_default_name to trap call from Component * • Component - added call to _assign_default_name() • PathwayProjection, Projection - added _assign_default_name to trap call from Component * • Component - added call to _assign_default_name() • PathwayProjection, Projection - added _assign_default_name to trap call from Component * • Moved call to _assign_default_projection_name from MappingProjection to Projection * • State - _validate_variable: removed: if not context: context = kwAssign + ' Base Value' else: context = context + kwAssign + ' Base Value' * • State - _validate_variable: removed: if not context: context = kwAssign + ' Base Value' else: context = context + kwAssign + ' Base Value' * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • Mechanism - added states and projections properties (as well as ones for each projection time) - added log_items property that returns a list of logged items and allows them to be set • State - fixed a bug preventing proper logging * • Mechanism - added states and projections properties (as well as ones for each projection time) - added log_items property that returns a list of logged items and allows them to be set • State - fixed a bug preventing proper logging * - * - * - * - * - * • README.rst and index.rst: revs to Intro, Purpose, and Contributors * • Mechanism - docstring: updated to include states, and projections attributes * • Mechanism - docstring: updated to include states, and projections attributes * • Mechanism - docstring: updated to include states, and projections attributes * • Mechanism - docstring: updated to include states, and projections attributes * - * - * - * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * - * - * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/projections/pathway/mappingprojection.py # psyneulink/components/projections/projection.py # psyneulink/components/states/inputstate.py # psyneulink/components/states/modulatorysignals/controlsignal.py # psyneulink/components/states/outputstate.py # psyneulink/components/states/parameterstate.py # psyneulink/components/states/state.py # tests/mechanisms/test_input_state_spec.py # tests/projections/test_projections_specifications.py * - * - * - * - * - * - * - * - * - * - * - * - * - * • Log - added an example to docstring * - * • Log - added numpy_array output method

- docstring: added full example (including logging a MappingProjection)

* • System - show_graph(): fixed bug producing empty image for graphs with just one Mechanism added auto-recurrent projections * • Log - added numpy_array output method * • Mechanism - added senders, modulators and receivers properties * • Mechanism - added senders, modulators and receivers properties * -

…Link into devel

* • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • Log - changed name of numpy_array method to nparray and added to docstring

…Link into devel

…Link into feat/normal-dist/matlab

* • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • Log - minor revs to docstring

…Link into devel

…error message

…Link into feat/normal-dist/matlab

…nUniversity/PsyNeuLink into feat/normal-dist/matlab

* • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * - * - * - * - * - * - * • Log - refactored to keep data for a Compoent in its *own* Log, and have others that require that data to reference it * • Log - LogLevels converted to masks - _get_log_context method added that checks context against mask - tests of context for logging now use _get_log_context * - * - * - * • Log, State, Projection - consolidated logging of value in Log._log_value * - * • ControlSignal - adding call to logg in value property • Log: Commented places ("FIX: IMPLEMENT EXECUTION+LEARNING CONDITION") that need refactoring to fully implement LogLevel and get_log_context * • Log - added value of owner as loggable_component * • Log - added value of owner as loggable_component * • Log - log_item: allows LogLevel names to be used for specification • Keywords - LogLevel names added as keywords

- consolidated logging of value in Log._log_value

- clear_entries (mostly) implemented (clears data but leaves entry) • Tests test_multilayer now tests LogLevel.LEARNING

- clear_entries: option added for deleting entry or just the data

- generalized context identification to search frame for most recent specification

…ep time, used in Scheduler and Conditions Clock has Time and TimeHistoryTree Time/SimpleTime store a representation of time using TimeScales TimeHistoryTree stores a representation of present and past time, keeping track of the number of times various TimeScales have occurred under the scope of other TimeScales

* feat/scheduling/enhanced-clock: create and integrate a new Clock class, and several new classes to keep time, used in Scheduler and Conditions remove old Clock/CentralClock

…Link into MERGE_WITH_CLOCK # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/mechanisms/mechanism.py # psyneulink/components/projections/projection.py # psyneulink/components/states/state.py # psyneulink/components/system.py # psyneulink/globals/log.py # tests/learning/test_multilayer.py

…Link into feat/Log/log_with_time # Conflicts: # Scripts/Scratch Pad.py # psyneulink/components/mechanisms/mechanism.py # psyneulink/components/projections/projection.py # psyneulink/components/states/state.py # psyneulink/components/system.py # psyneulink/globals/log.py # tests/learning/test_multilayer.py

- implemented _get_time (not yet reported in print_entries, csv or nparray)

- nparray: implemented reporting of asynchronous entries • Tests - test_multilayer: updated log test per above

- integrated with Timing; now reports run:trial:time_step - nparray & csv: implemented reporting of asynchronous entries - implemented _get_time • Tests - test_multilayer: updated log test per above - test_log: updated per above

jdcpni and others added 30 commits November 30, 2017 14:56

• System

263b22b

- show_graph(): bug fix for ControlProjections

adding new UniformToNormalDist function which allows for a direct com…

0f1613d

…parison of random numbers between python and matlab

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

9d440d2

…Link into feat/normal-dist/matlab

adding a pytest for the new uniform --> normal distribution function

6546d27

• System

2966f43

- show_graph(): bug fix for ControlProjections

fix incorrect construction of Process and System in Multitasking exam…

ed0e604

…ple script

adding LC Control Mechanism test to verify that it is updating multip…

aa97dd7

…licative param(s) of modulated mechanism(s) properly

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

5a885c1

…Link into fix/lc-control-mechanism/modulation

Merge pull request #567 from PrincetonUniversity/fix/lc-control-mecha…

175acd2

…nism/modulation Fix/lc control mechanism/modulation

add docstring explanation for processing and learning termination con…

90c316f

…ditions

EVCAuxiliary: replace kwargs function signatures with explicit arguments

42200ff

• Log

f11ec55

- docstring: added full example (including logging a MappingProjection)

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

d681e33

…Link into devel

Name/log/numpy array to nparray (#571)

4e5ab8a

* • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • Log - changed name of numpy_array method to nparray and added to docstring

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

ad06e2d

…Link into devel

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

22becf7

…Link into feat/normal-dist/matlab

adding gilzenrat figures in _build file

bc5651e

Docs/log/docstring update (#572)

7a3c2ae

* • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • Log - minor revs to docstring

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

f33338c

…Link into devel

validating uniform-to-normal distribution function (matlab)

d2c43ad

adding documentation for UniformToNormalDist

92cc9bc

Merge branch 'devel' into feat/normal-dist/matlab

966f9cb

using UniformToNormalDist pytest as a check of the scipy requirement …

e2470f0

…error message

Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…

70466a0

…Link into feat/normal-dist/matlab

Merge branch 'feat/normal-dist/matlab' of https://github.com/Princeto…

6f30017

…nUniversity/PsyNeuLink into feat/normal-dist/matlab

jdcpni and others added 29 commits December 7, 2017 15:06

• Log, State, Projection

04c6d53

- consolidated logging of value in Log._log_value

• Log

eb2c364

- clear_entries (mostly) implemented (clears data but leaves entry) • Tests test_multilayer now tests LogLevel.LEARNING

• Log

cea37ca

- clear_entries: option added for deleting entry or just the data

• Log

7aa78cb

- generalized context identification to search frame for most recent specification

remove old Clock/CentralClock

7a1b1f1

Merge branch 'feat/scheduling/enhanced-clock' into devel

ae3d61d

* feat/scheduling/enhanced-clock: create and integrate a new Clock class, and several new classes to keep time, used in Scheduler and Conditions remove old Clock/CentralClock

rename psyneulink.scheduling.timescale -> psyneulink.scheduling.time

06d32c2

-

01a2d09

• Successfully merged with devel

c613e73

• Log

acc3662

- implemented _get_time (not yet reported in print_entries, csv or nparray)

• Log

c1c57f7

- implemented _get_time (not yet reported in print_entries, csv or nparray)

• Log

b7870d0

- implemented _get_time (not yet reported in print_entries, csv or nparray)

-

d68a52b

-

7b1a647

• Log

c120b40

- nparray: implemented reporting of asynchronous entries • Tests - test_multilayer: updated log test per above

-

0bce146

-

e2064cb

-

329fc7f

-

db1bce6

-

18c11ae

-

93dd01c

-

f9629f1

-

ad56703

-

fcaba5a

• Log

d757d3d

- integrated with Timing; now reports run:trial:time_step - nparray & csv: implemented reporting of asynchronous entries - implemented _get_time • Tests - test_multilayer: updated log test per above - test_log: updated per above

jdcpni merged commit 2c8fd6c into master Dec 10, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/log/log with time #582

Feat/log/log with time #582

jdcpni commented Dec 10, 2017

Feat/log/log with time #582

Feat/log/log with time #582

Conversation

jdcpni commented Dec 10, 2017