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

Docs/arguments/thin #1387

Merged
merged 68 commits into from
Nov 10, 2019
Merged

Docs/arguments/thin #1387

merged 68 commits into from
Nov 10, 2019

Conversation

jdcpni
Copy link
Collaborator

@jdcpni jdcpni commented Nov 10, 2019

• ProcessingMechanism
  - modified MAX_VAL and MAX_ABS_VAL standard_output_ports
    to return scalar rather than OneHot values
  - added MAX_ONE_HOT and MAX_ABS_ONE_HOT standard_output_ports

• TransferMechanism
  - added COMBINE to standard_output_ports

• tests
  - test_transfer_mechanism
    added test_combine_standard_output_port
  - test_processing_mechanism
    added tests for standard_ouput_ports

• ComparatorMechanism
  - _validate_params: fixed bug causing crash if sample and/or target input_port not specified

• DDM
  removed DDM_OUTPUT;  replaced with DDM.standard_output_ports
  NOTE:  all prior references to pnl.DDM_OUTPUT.<OUTPUT_PORT_NAME>
         can now use use just pnl.<<OUTPUT_PORT_NAME>

• ContrastiveHebbianMechanism
  - fixed bug in which target_size=0 caused crash

• SelectionFunctions
  - OneHot:  fixed bug in *_ABS_VAL value modes

jdcpni added 30 commits November 1, 2019 13:51
  - automated assignment of attributes from Keywords.OUTPUTS

• RecurrentTransferMechanism
  - renamed definition of local ENERGY to ENERGY_OUTPUT_PORT
  - renamed definition of local ENTROPY to ENTROPY_OUTPUT_PORT
  - added standard_output_ports and standard_output_port_names

• TransferMechanism
  - standard_output_ports and standard_output_port_names now inherited
  Names of standard_output_states: OUTPUT_<*> -> <*>

• OutputPort
  - _instantiate_output_port: added instantiation of owner.standard_output_ports
  - eliminated instantiation of owner.standard_output_ports
    (moved to OutputPort._instantiate_output_port
  - moved definition of standard_output_ports from ProcessingMechanism to Mechanism_Base
  - If TransferMechanism has > 1 InputPort, RESULT renamed as RESULT-0
  RESULTS -> RESULT
  RESULTS -> RESULT
jdcpni added 28 commits November 7, 2019 08:06
# Conflicts:
#	.idea/runConfigurations/Scratch_Pad.xml
#	psyneulink/core/components/ports/outputport.py
#	psyneulink/library/components/mechanisms/processing/objective/predictionerrormechanism.py
#	psyneulink/library/components/mechanisms/processing/transfer/lcamechanism.py
  - fixed bug in which target_size=0 caused crash
  - _validate_params: fixed bug causing crash if sample and/or target input_port not specified
  removed DDM_OUTPUT;  replaced with DDM.standard_output_ports
  NOTE:  all prior references to pnl.DDM_OUTPUT.<OUTPUT_PORT_NAME>
         can now use use just pnl.<<OUTPUT_PORT_NAME>
  - added COMBINE to standard_output_ports
  - test_transfer_mechanism
    added test_combine_standard_output_port
  - test_processing_mechanism
    added tests for standard_ouput_ports
  - OneHot:  fixed bug in *_ABS_VAL value modes

• ProcessingMechanism
  - modified MAX_VAL and MAX_ABS_VAL standard_output_ports
    to return scalar rather than OneHot values
  - added MAX_ONE_HOT and MAX_ABS_ONE_HOT standard_output_ports
  - OneHot:  fixed bug in *_ABS_VAL value modes

• ProcessingMechanism
  - modified MAX_VAL and MAX_ABS_VAL standard_output_ports
    to return scalar rather than OneHot values
  - added MAX_ONE_HOT and MAX_ABS_ONE_HOT standard_output_ports
@jdcpni jdcpni merged commit 2abfca3 into devel Nov 10, 2019
@jdcpni jdcpni deleted the docs/arguments/thin branch November 10, 2019 15:28
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.

2 participants