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.

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

Fix/controlmechanism/assign as controller #621

Merged
merged 176 commits into from
Jan 17, 2018

Conversation

jdcpni
Copy link
Collaborator

@jdcpni jdcpni commented Jan 17, 2018

• System, ControlMechanism, ObjectiveMechanism
  - fixed bug with matrix specification for monitored_output_states
  - fixed bug in assign_as_controller for controller with existing monitored_output_states

jdcpni and others added 29 commits January 11, 2018 12:02
  _instantiate_output_states():
      reverted to ordinary instantation of default ControlSignal if none specified
fixed typo in owner attribute description
  _instantiate_output_states():
      reverted to ordinary instantation of default ControlSignal if none specified
  _get_monitored_output_states_for_system():
    fixed bug in which string and tuple specifications were ignored
  _get_monitored_output_states_for_system():
    fixed bug in which string and tuple specifications were ignored
  _get_monitored_output_states_for_system():
    fixed bug in which string and tuple specifications were ignored
* • 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
  - fixed bugs preventing logging during INITIALIZATION

* • Log
  - fixed bugs preventing logging during INITIALIZATION

* -

* -

* -

* -

* -

* • Log
  - logged_item, print_entries:  corrected to use 'value' rather than owner's name in reports

* • Log
  - logged_item, print_entries:  corrected to use 'value' rather than owner's name in reports

• Tests
  test_log:  added test_log_initialization

* • Log
  - _alias_owner_name:  added to used 'value' rather than owner's name in reports
  - nparray: bug fix to handle None values

• Tests
  test_log:  added test_log_initialization

* • Log
  - log_value: added

• Tests
  - test_multilayer: added test of log_value

* • Log
  - log_value: implemented
  - logged_item, print_entries:  corrected to use 'value' rather than owner's name in reports

• Tests
  - test_multilayer: added test of log_value

* • Log
  - log_value: implemented
  - logged_item, print_entries:  corrected to use 'value' rather than owner's name in reports

• Tests
  - test_multilayer: added test of log_value

* -

* • Component
  - moved value property to Component (from Mechanism, Projection and State)
    (left an override on ControlSignal that needs it for the getter)

* • Log
  - docstring: added hint about using call_before_trial and call_after_trial
    to log values

* -

* -

* • ObjectiveMechanism
  _instantiate_input_states():  corrected to used monitored_output_state_specs

* • System
  _instantiate_controller():
      added assignment of controller.control_signals to self.control_signals

* -

* • ControlMechanism
  _instantiate_output_states():
      modifed to not instantiate a default OutputState
      if no ControlSignals are specified

* • ControlMechanism
  _instantiate_output_states():
      reverted to ordinary instantation of default ControlSignal if none specified

* • ControlMechanism
  _instantiate_output_states():
      reverted to ordinary instantation of default ControlSignal if none specified

* • System
  _get_monitored_output_states_for_system():
    fixed bug in which string and tuple specifications were ignored

* • System
  _get_monitored_output_states_for_system():
    fixed bug in which string and tuple specifications were ignored

* • System
  _get_monitored_output_states_for_system():
    fixed bug in which string and tuple specifications were ignored

* -

* -

* -
  LinearCombination()._validate_params:
      fixed check on length of weight and exponents
  LinearCombination()._validate_params:
      fixed check on length of weight and exponents
* • 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
  - fixed bugs preventing logging during INITIALIZATION

* • Log
  - fixed bugs preventing logging during INITIALIZATION

* -

* -

* -

* -

* -

* • Log
  - logged_item, print_entries:  corrected to use 'value' rather than owner's name in reports

* • Log
  - logged_item, print_entries:  corrected to use 'value' rather than owner's name in reports

• Tests
  test_log:  added test_log_initialization

* • Log
  - _alias_owner_name:  added to used 'value' rather than owner's name in reports
  - nparray: bug fix to handle None values

• Tests
  test_log:  added test_log_initialization

* • Log
  - log_value: added

• Tests
  - test_multilayer: added test of log_value

* • Log
  - log_value: implemented
  - logged_item, print_entries:  corrected to use 'value' rather than owner's name in reports

• Tests
  - test_multilayer: added test of log_value

* • Log
  - log_value: implemented
  - logged_item, print_entries:  corrected to use 'value' rather than owner's name in reports

• Tests
  - test_multilayer: added test of log_value

* -

* • Component
  - moved value property to Component (from Mechanism, Projection and State)
    (left an override on ControlSignal that needs it for the getter)

* • Log
  - docstring: added hint about using call_before_trial and call_after_trial
    to log values

* -

* -

* • ObjectiveMechanism
  _instantiate_input_states():  corrected to used monitored_output_state_specs

* • System
  _instantiate_controller():
      added assignment of controller.control_signals to self.control_signals

* -

* • ControlMechanism
  _instantiate_output_states():
      modifed to not instantiate a default OutputState
      if no ControlSignals are specified

* • ControlMechanism
  _instantiate_output_states():
      reverted to ordinary instantation of default ControlSignal if none specified

* • ControlMechanism
  _instantiate_output_states():
      reverted to ordinary instantation of default ControlSignal if none specified

* • System
  _get_monitored_output_states_for_system():
    fixed bug in which string and tuple specifications were ignored

* • System
  _get_monitored_output_states_for_system():
    fixed bug in which string and tuple specifications were ignored

* • System
  _get_monitored_output_states_for_system():
    fixed bug in which string and tuple specifications were ignored

* -

* -

* -

* • Function
  LinearCombination()._validate_params:
      fixed check on length of weight and exponents

* • Function
  LinearCombination()._validate_params:
      fixed check on length of weight and exponents
  - added input_states as argument to constructor
  - added input_states as argument to constructor
  - added input_states as argument to constructor

• System, ControlMechanism, EVCControlMechanism
  - clean-up for assign_as_controller
* • 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
  - fixed bugs preventing logging during INITIALIZATION

* • Log
  - fixed bugs preventing logging during INITIALIZATION

* -

* -

* -

* -

* -

* • Log
  - logged_item, print_entries:  corrected to use 'value' rather than owner's name in reports

* • Log
  - logged_item, print_entries:  corrected to use 'value' rather than owner's name in reports

• Tests
  test_log:  added test_log_initialization

* • Log
  - _alias_owner_name:  added to used 'value' rather than owner's name in reports
  - nparray: bug fix to handle None values

• Tests
  test_log:  added test_log_initialization

* • Log
  - log_value: added

• Tests
  - test_multilayer: added test of log_value

* • Log
  - log_value: implemented
  - logged_item, print_entries:  corrected to use 'value' rather than owner's name in reports

• Tests
  - test_multilayer: added test of log_value

* • Log
  - log_value: implemented
  - logged_item, print_entries:  corrected to use 'value' rather than owner's name in reports

• Tests
  - test_multilayer: added test of log_value

* -

* • Component
  - moved value property to Component (from Mechanism, Projection and State)
    (left an override on ControlSignal that needs it for the getter)

* • Log
  - docstring: added hint about using call_before_trial and call_after_trial
    to log values

* -

* -

* • ObjectiveMechanism
  _instantiate_input_states():  corrected to used monitored_output_state_specs

* • System
  _instantiate_controller():
      added assignment of controller.control_signals to self.control_signals

* -

* • ControlMechanism
  _instantiate_output_states():
      modifed to not instantiate a default OutputState
      if no ControlSignals are specified

* • ControlMechanism
  _instantiate_output_states():
      reverted to ordinary instantation of default ControlSignal if none specified

* • ControlMechanism
  _instantiate_output_states():
      reverted to ordinary instantation of default ControlSignal if none specified

* • System
  _get_monitored_output_states_for_system():
    fixed bug in which string and tuple specifications were ignored

* • System
  _get_monitored_output_states_for_system():
    fixed bug in which string and tuple specifications were ignored

* • System
  _get_monitored_output_states_for_system():
    fixed bug in which string and tuple specifications were ignored

* -

* -

* -

* • Function
  LinearCombination()._validate_params:
      fixed check on length of weight and exponents

* • Function
  LinearCombination()._validate_params:
      fixed check on length of weight and exponents

* • IntegratorMechanism
  - added input_states as argument to constructor

* • IntegratorMechanism
  - added input_states as argument to constructor

* • IntegratorMechanism
  - added input_states as argument to constructor

• System, ControlMechanism, EVCControlMechanism
  - clean-up for assign_as_controller

* -
  - fixed bug with matrix specification for monitored_output_states
  - fixed bug with matrix specification for monitored_output_states
  - fixed bug in assign_as_controller for controller with existing monitored_output_states
  - fixed bug in assign_as_controller for controller with existing monitored_output_states
@jdcpni jdcpni merged commit 862b8c1 into master Jan 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants