Skip to content

Commit

Permalink
Do not set module default labels
Browse files Browse the repository at this point in the history
Addresses #234.

Made possible with the merge of nengo/nengo-gui#1002.
  • Loading branch information
jgosmann committed Nov 18, 2019
1 parent 1e026d1 commit 5af2153
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 13 deletions.
8 changes: 4 additions & 4 deletions nengo_spa/modules/associative_memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class AssociativeMemory(Network):

def __init__(
self, selection_net, input_vocab, output_vocab=None, mapping=None,
n_neurons=50, label="Associative memory", seed=None,
n_neurons=50, label=None, seed=None,
add_to_container=None, vocabs=None, **selection_net_kwargs):
super(AssociativeMemory, self).__init__(
label=label, seed=seed, add_to_container=add_to_container,
Expand Down Expand Up @@ -158,7 +158,7 @@ class IAAssocMem(AssociativeMemory):
"""
def __init__(
self, input_vocab, output_vocab=None, mapping=None,
n_neurons=50, label="IA associative memory", seed=None,
n_neurons=50, label=None, seed=None,
add_to_container=None, vocabs=None, **selection_net_kwargs):
super(IAAssocMem, self).__init__(
selection_net=IA,
Expand All @@ -177,7 +177,7 @@ class ThresholdingAssocMem(AssociativeMemory):
"""
def __init__(
self, threshold, input_vocab, output_vocab=None, mapping=None,
n_neurons=50, label="Thresholding associative memory", seed=None,
n_neurons=50, label=None, seed=None,
add_to_container=None, vocabs=None, **selection_net_kwargs):
selection_net_kwargs['threshold'] = threshold
super(ThresholdingAssocMem, self).__init__(
Expand All @@ -195,7 +195,7 @@ class WTAAssocMem(AssociativeMemory):
"""
def __init__(
self, threshold, input_vocab, output_vocab=None, mapping=None,
n_neurons=50, label="WTA associative memory", seed=None,
n_neurons=50, label=None, seed=None,
add_to_container=None, vocabs=None, **selection_net_kwargs):
selection_net_kwargs['threshold'] = threshold
super(WTAAssocMem, self).__init__(
Expand Down
1 change: 0 additions & 1 deletion nengo_spa/modules/basalganglia.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ def __init__(
self, action_count, n_neurons_per_ensemble=Default,
output_weight=Default, input_bias=Default, ampa_synapse=Default,
gaba_synapse=Default, **kwargs):
kwargs.setdefault('label', "Basal ganglia")
super(BasalGanglia, self).__init__(**kwargs)

self.action_count = action_count
Expand Down
1 change: 0 additions & 1 deletion nengo_spa/modules/bind.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class Bind(Network):

def __init__(self, vocab=Default, neurons_per_dimension=Default,
unbind_left=Default, unbind_right=Default, **kwargs):
kwargs.setdefault('label', "Bind")
super(Bind, self).__init__(**kwargs)

self.vocab = vocab
Expand Down
1 change: 0 additions & 1 deletion nengo_spa/modules/compare.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class Compare(Network):
'neurons_per_dimension', default=200, low=1, readonly=True)

def __init__(self, vocab=Default, neurons_per_dimension=Default, **kwargs):
kwargs.setdefault('label', "Compare")
super(Compare, self).__init__(**kwargs)

self.vocab = vocab
Expand Down
1 change: 0 additions & 1 deletion nengo_spa/modules/product.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class Product(Network):
n_neurons = IntParam('n_neurons', default=200, low=1, readonly=True)

def __init__(self, n_neurons=Default, **kwargs):
kwargs.setdefault('label', "Product")
super(Product, self).__init__(**kwargs)

self.n_neurons = n_neurons
Expand Down
1 change: 0 additions & 1 deletion nengo_spa/modules/scalar.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class Scalar(Network):
n_neurons = IntParam('n_neurons', default=50, low=1, readonly=True)

def __init__(self, n_neurons=Default, **kwargs):
kwargs.setdefault('label', "Scalar")
super(Scalar, self).__init__(**kwargs)

self.n_neurons = n_neurons
Expand Down
1 change: 0 additions & 1 deletion nengo_spa/modules/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ def __init__(self, vocab=Default, subdimensions=Default,
neurons_per_dimension=Default, feedback=Default,
represent_cc_identity=Default,
feedback_synapse=Default, **kwargs):
kwargs.setdefault('label', "State")
super(State, self).__init__(**kwargs)

self.vocab = vocab
Expand Down
1 change: 0 additions & 1 deletion nengo_spa/modules/superposition.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class Superposition(Network):

def __init__(self, n_inputs, vocab=Default, neurons_per_dimension=Default,
**kwargs):
kwargs.setdefault('label', "Superposition")
super(Superposition, self).__init__(**kwargs)

self.vocab = vocab
Expand Down
1 change: 0 additions & 1 deletion nengo_spa/modules/thalamus.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ def __init__(self, action_count, neurons_action=Default,
synapse_bg=Default, neurons_channel_dim=Default,
synapse_channel=Default, neurons_gate=Default,
threshold_gate=Default, synapse_to_gate=Default, **kwargs):
kwargs.setdefault('label', "Thalamus")
super(Thalamus, self).__init__(**kwargs)

self.action_count = action_count
Expand Down
1 change: 0 additions & 1 deletion nengo_spa/modules/transcode.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ class Transcode(Network):
def __init__(
self, function=Default, input_vocab=Default, output_vocab=Default,
size_in=Default, size_out=Default, **kwargs):
kwargs.setdefault('label', "Transcode")
super(Transcode, self).__init__(**kwargs)

# Vocabs need to be set before function which accesses vocab for
Expand Down

0 comments on commit 5af2153

Please sign in to comment.