Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* • System - show_graph(): bug fix for ControlProjections * adding new UniformToNormalDist function which allows for a direct comparison of random numbers between python and matlab * adding a pytest for the new uniform --> normal distribution function * • System - show_graph(): bug fix for ControlProjections * Feat/log (#564) * • 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 * - * - * - * - * - * - * - * - * - * - * - * - * - * Feat/log (#565) * • 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 * fix incorrect construction of Process and System in Multitasking example script * adding LC Control Mechanism test to verify that it is updating multiplicative param(s) of modulated mechanism(s) properly * Feat/log (#568) * • 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) * add docstring explanation for processing and learning termination conditions * EVCAuxiliary: replace kwargs function signatures with explicit arguments * Feat/log (#569) * • 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 * Feat/mechanism/additional props (#570) * • 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 * - * Name/log/numpy array to nparray (#571) * • 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 * adding gilzenrat figures in _build file * Docs/log/docstring update (#572) * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * • Log - minor revs to docstring * validating uniform-to-normal distribution function (matlab) * adding documentation for UniformToNormalDist * using UniformToNormalDist pytest as a check of the scipy requirement error message * Fix/log/logged items bug (#577) * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * - * - * • Log - logged_items: fixed bug erroneously reporting LogLevels as OFF • Tests - added tests/global - added tests/global/test_log_docs * - * pytest: Add benchmarking plugin v2: add benchmark to dev_requirements Signed-off-by: Jan Vesely <[email protected]> * setup.cfg: Disable benchmarks by default Signed-off-by: Jan Vesely <[email protected]> * setup.cfg: Use warmup if benchmarks are enabled This should filter out any compilation overhead Signed-off-by: Jan Vesely <[email protected]> * Add distance function tests Signed-off-by: Jan Vesely <[email protected]> * Add transfer function tests Signed-off-by: Jan Vesely <[email protected]> * Add integrator function tests Signed-off-by: Jan Vesely <[email protected]> * function: test for both 1d and 2d noise works around a function test failure Signed-off-by: Jan Vesely <[email protected]> * Docs/log/docstring update (#578) * • System - show_graph(): bug fix for ControlProjections * • System - show_graph(): bug fix for ControlProjections * - * - * • Log - logged_items: fixed bug erroneously reporting LogLevels as OFF • Tests - added tests/global - added tests/global/test_log_docs * - * • Log - docstring: fixed some types • Component - docstring: added entries for Log * - * • Log - docstring corrections * Refactor/log/entry management (#579) * • System - show_graph(): fixed bug producing empty image for graphs with just one Mechanism added auto-recurrent projections * • Log - added numpy_array output method * • Log - docstring corrections * • Log - changed all references to LogEntry to use field names - EntryDict: added valiation of assignments as LogEntry in setter * • Log - changed all references to LogEntry to use field names - EntryDict: added valiation of assignments as LogEntry in setter * • Log - changed all references to LogEntry to use field names - EntryDict: added valiation of assignments as LogEntry in setter • Tests - added TestLog * • Component: - make_property (Line 2883): changed return value * • Component: - make_property (Line 2883): changed return value * - * - * • Log - refactored to keep data for a Compoent in its *own* Log, and have others that require that data to reference it * • Log - refactored to keep data for a Compoent in its *own* Log, and have others that require that data to reference it * - * - * - * - * - * - * - * - * • 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 * Feat/log/log levels (#580) * • 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 * • Log, State, Projection - consolidated logging of value in Log._log_value * • Log - clear_entries (mostly) implemented (clears data but leaves entry) • Tests test_multilayer now tests LogLevel.LEARNING * • Log - clear_entries: option added for deleting entry or just the data * • Log - generalized context identification to search frame for most recent specification * remove old Clock/CentralClock * create and integrate a new Clock class, and several new classes to keep 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 * rename psyneulink.scheduling.timescale -> psyneulink.scheduling.time * - * Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink 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 * • Successfully merged with devel * • Log - implemented _get_time (not yet reported in print_entries, csv or nparray) * • Log - implemented _get_time (not yet reported in print_entries, csv or nparray) * • Log - implemented _get_time (not yet reported in print_entries, csv or nparray) * - * - * • Log - nparray: implemented reporting of asynchronous entries • Tests - test_multilayer: updated log test per above * - * - * - * - * - * - * - * - * - * • Log - 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
- Loading branch information
