PrincetonUniversity / PsyNeuLink / 820 / 2

84%

master: 84%

push

travis-ci

Feat/learning/contrastivehebbian (#849)

* • NieuwenhuisModel:
  Added LC_process

* 1

* -

* -

* -

* -

* -

* -

* InputState: don't prevent reduction of dimension by LinearCombination in np.ndarray with ndim > 1

* -

* • AutoAssociativeLearningMechanism
  _validate_variable: modified test to accomodate 2d variable

* • AutoAssociativeLearningMechanism
  _validate_variable: modified test to accomodate 2d variable

* Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/learning/contrastive_hebbian_new

# Conflicts:
#	.idea/runConfigurations/Scratch_Pad.xml

* Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/learning/contrastive_hebbian_new

# Conflicts:
#	.idea/runConfigurations/Scratch_Pad.xml

* Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/learning/contrastive_hebbian_new

# Conflicts:
#	.idea/runConfigurations/Scratch_Pad.xml

* • Component
  _assign_args_to_param_dicts:
     fixed bug in which items of params dict that had not been assigned
     any value (i.e., were still None) were overriting values assigned
     in constructor argument

* -

* • Component
  _assign_args_to_param_dicts:
     fixed bug in which items of params dict that had not been assigned
     any value (i.e., were still None) were overriting values assigned
     in constructor argument

• Mechanism
  added attributes_dict_entries: dictionary of entries to use in attributes_dict
  _instantiate_attributes_before_function: added assignmenet of attributes_dict_entries
  attributes_dict:  now constucted using attributes_dict_entries

* -

* -

* Merge branch 'feat/contrastivehebbian/retry' of https://github.com/PrincetonUniversity/PsyNeuLink into feat/contrastivehebbian/retry

# Conflicts:
#	.idea/runConfigurations/py_test_in_tests.xml

* • RecurrentTransferMechanism
  _linear_combin_func:
      rename... (continued)

5267 of 7474 branches covered (70.47%)

Branch coverage included in aggregate %.

13472 of 16705 relevant lines covered (80.65%)

0.81 hits per line