PrincetonUniversity / PsyNeuLink / 11523591902 / 1

84%

master: 84%

Pull #3071

github

Fix/one hot max indicator (#3079)

• emcomposition.py
  - field_inputs_nodes -> input_nodes_by_fields
  - refactor naming of retrieval nodes to
    use input_nodes_by_fields
  - revise naming of retrieval nodes to use name_without_suffix for reference
  -  WEIGHTED -> WEIGHTED_AVG

* • port.py:
  _parse_port_spec():  enhance error message for bad MECHANISM entry in modulatory param specification

* • lcamechanism.py:
  make matrix, auto, hetero and competition params non-modulable until that is implemented

* • selectionfunctions.py
  - OneHot._function: add ARG_MAX, ARG_MAX_INDICATOR, ARG_MIN, ARG_MIN_INDICATOR

* • selectionfunctions.py
  - OneHot:  add arg_max, arg_max_indicator, arg_min, and arg_min_indicator options
  - move ARG_XXX keywords to keywords.py

* • transferfunctions.py
  - OneHot:
    - add ARG_MAX_ABS, ARG_MAX_ABS_INDICATOR, ARG_MIN_ABS, ARG_MIN_ABS_INDICATOR
    - change default mode to ARG_MAX
    - relabel options for _gen_llvm from XXX_VAL to ARG_XXX

• memoryfunctions.py
  - DictionaryMemory._gen_llvm_function_body:  replace MIN_VAL with ARG_MIN in selection.function.mode

* • test_emcomposition.py
  test warning for ARG_MAX or PROBABILISTIC with enable_learning = True

• test_selection.py
  - test_basic: add tests of OneHot for ARG_XXX
  - exclude LLVM tests for XXX_VAL
  - test now use llvm_not_implemented for OneHot modes not supported by LLVM

• test_transfer.py
  - test_basic: add tests of SoftMax for ARG_XXX
  - exclude LLVM tests for XXX__VAL

9295 of 12332 branches covered (75.37%)

Branch coverage included in aggregate %.

32234 of 37283 relevant lines covered (86.46%)

0.86 hits per line