Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
98403ac
Update part_3_connecting_networks_with_synapses.rst
anthonyylee May 13, 2023
b5e67c4
Update part_3_connecting_networks_with_synapses.rst
anthonyylee May 13, 2023
3407eb1
Update noise_generator.h
anthonyylee May 14, 2023
122b52b
Merge branch 'nest:master' into master
anthonyylee May 17, 2023
56f1e68
Added missing import statement
anthonyylee May 17, 2023
da85489
Update part_3_connecting_networks_with_synapses.rst
anthonyylee May 17, 2023
3e784fe
Fixed code error.
anthonyylee May 17, 2023
7e58608
Fixed code error
anthonyylee May 17, 2023
46ef3c7
Fixed code
anthonyylee May 17, 2023
e3d46c6
Fixed SynapseCollection.print_full
anthonyylee May 17, 2023
8ea1981
Fixed typo
anthonyylee May 17, 2023
fb76bf3
Updated to match previous section variable usage convention.
anthonyylee May 18, 2023
86ce7df
Updated variable
anthonyylee May 18, 2023
20125d9
Fixed unexpected indents
anthonyylee May 18, 2023
a1c6da0
Fixed numpy namespace
anthonyylee May 18, 2023
3714ecc
Fixed typo
anthonyylee May 18, 2023
c9972bb
Templating typo
anthonyylee May 18, 2023
92354e4
Fixed typo
anthonyylee May 18, 2023
2487456
Fixed typo
anthonyylee May 18, 2023
7b7efed
Merge branch 'nest:master' into master
anthonyylee Jun 1, 2023
537a087
Update glif_cond.h - Latex formatting
anthonyylee Jun 1, 2023
aaa10d6
Wrapped in math block
anthonyylee Jun 14, 2023
d3d4105
Update doc/htmldoc/neurons/parametrization.rst
anthonyylee Jun 14, 2023
376e82a
Update doc/htmldoc/neurons/parametrization.rst
anthonyylee Jun 14, 2023
80d74dd
Update doc/htmldoc/neurons/parametrization.rst
anthonyylee Jun 14, 2023
e81c887
numpy instead of np namespace
anthonyylee Jun 14, 2023
3ee502f
Merge branch 'nest:master' into master
anthonyylee Jun 14, 2023
c231e49
Fixed unit typo
anthonyylee Jun 14, 2023
55b5d7b
Fixed typo
anthonyylee Jun 15, 2023
9b32f30
Merge branch 'master' into master
anthonyylee Jun 25, 2023
ed6f318
Update models/glif_cond.h
anthonyylee Jun 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/htmldoc/devices/record_from_simulations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ kernel attribute ``recording_backends``.

If a recording backend has global properties (i.e., parameters shared
by all enrolled recording devices), those can be inspected with
:py:func`.GetDefaults`
:py:func:`.GetDefaults`

::

Expand Down
4 changes: 2 additions & 2 deletions doc/htmldoc/nest_behavior/running_simulations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ In linear simulation scripts that build a network, simulate it, carry
out some post-processing and exit, the user does not have to worry about
the delay extrema *dmin* and *dmax* as they are set automatically to the
correct values. However, NEST also allows subsequent calls
to\ :py:func:`.Simulate`, which only work correctly if the content of the spike
to :py:func:`.Simulate`, which only work correctly if the content of the spike
buffers is preserved over the simulations.

As mentioned above, the size of that buffer depends on *dmin+dmax* and
Expand Down Expand Up @@ -125,7 +125,7 @@ also means that the membrane potential recording will never show values
above the threshold. The time of the spike is always the time at *the
end of the interval* during which the threshold was crossed.

NEST also has a some models that determine the precise time of the
NEST also has some models that determine the precise time of the
threshold crossing during the interval. Please see the documentation on
:ref:`precise spike time neurons <sim_precise_spike_times>`
for details about neuron update in continuous time and the
Expand Down
10 changes: 5 additions & 5 deletions doc/htmldoc/neurons/parametrization.rst
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ others can be used when connecting.
spatial_nodes = nest.Create('iaf_psc_alpha', positions=positions)

parameter = -60 + nest.spatial.pos.x + (0.4 * nest.spatial.pos.x * nest.random.normal())
spatial_nodes.set('V_m'=parameter)
spatial_nodes.set(V_m=parameter)

node_pos = np.array(nest.GetPosition(spatial_nodes))
node_pos[:,1]
Expand Down Expand Up @@ -252,7 +252,7 @@ parameter:
fig, ax = pyplot.subplots(figsize=(12, 6))
bars = ax.hist(targets, bins=N, edgecolor='black', linewidth=1.2)

pyplot.xticks(bars[1] + 0.5,np.arange(1, N+1))
pyplot.xticks(bars[1] + 0.5,np.arange(1, N+2))
ax.set_title('Connections from node with NodeID {}'.format(spatial_nodes[middle_node].get('global_id')))
ax.set_xlabel('Target NodeID')
ax.set_ylabel('Num. connections');
Expand Down Expand Up @@ -468,9 +468,9 @@ Using parameters makes it easy to set node properties
| | |
| :: | :: |
| | |
| for gid in nrns: | nrns.V_m=nest.random.uniform(-20., 20) |
| v_m = numpy.random.uniform(-20., 20.) | |
| nest.SetStatus([node_id], {'V_m': V_m}) | |
| for gid in nrns: | nrns.V_m = nest.random.uniform(-20.0, 20.0) |
| v_m = numpy.random.uniform(-20.0, 20.0) | |
| nest.SetStatus(gid, {"V_m": v_m}) | |
| | |
| | |
+-----------------------------------------------+----------------------------------------------------+
6 changes: 3 additions & 3 deletions doc/htmldoc/synapses/connection_management.rst
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Generator Interface and randomly connects 10% of the neurons from
import csa
cg = csa.cset(csa.random(0.1), 10000.0, 1.0)

# Map weight and delay indices to vaules from cg
# Map weight and delay indices to values from cg
params_map = {'weight': 0, 'delay': 1}

conn_spec_dict = {'rule': 'conngen', 'cg': cg, 'params_map': params_map}
Expand Down Expand Up @@ -359,7 +359,7 @@ fixed outdegree
^^^^^^^^^^^^^^^

For rule ``fixed_outdegree`` the array has to be a two-dimensional
NumPy array or Python list with shape ``(len(pre), outdegree)``, where
NumPy array or Python list with shape ``(len(A), outdegree)``, where
:hxt_ref:`outdegree` is the number of outgoing connections per source
neuron. This means that the rows describe the source, while the
columns represent the connections starting from the source neuron
Expand Down Expand Up @@ -765,7 +765,7 @@ given model.

To further customize the process of creating synapses, it is often
useful to have the same basic synapse model available with different
parametizations. To this end, :py:func:`.CopyModel` can be used to
parametrizations. To this end, :py:func:`.CopyModel` can be used to
create custom synapse types from already existing synapse types. In
the simplest case, it takes the names of the existing model and the
copied type to be created. The optional argument ``params`` allows to
Expand Down
4 changes: 2 additions & 2 deletions doc/htmldoc/synapses/handling_connections.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ as NodeCollections.
Printing
Printing a SynapseCollection produces a table with source and target node IDs, synapse model, weight and delay.
If your SynapseCollection has more than 36 elements, only the first and last 15 connections are displayed.
To print all, first set ``print_all = True`` on your SynapseCollection.
To print all, first set ``print_full = True`` on your SynapseCollection.

>>> nest.Connect(nodes[:2], nodes[:2])
>>> synapses = nest.GetConnections()
Expand All @@ -52,7 +52,7 @@ Printing
2 1 static_synapse 1.000 1.000
2 2 static_synapse 1.000 1.000

>>> synapses.print_all = True
>>> synapses.print_full = True

.. _conn_indexing:

Expand Down
13 changes: 13 additions & 0 deletions doc/htmldoc/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,19 @@ <h1>Welcome to the NEST Simulator documentation!</h1>
<a href="understand_index.html" class="buttonlink">How NEST works</a>
</div>
</div>


<div class="accordion"> <img id="pulse" src="_static/img/pulse.svg" style="position:relative" />
<pre><code class="language-python">
import nest
import matplotlib.pyplot as plt
</code></pre>
<div>
<ul>
<li><a href="installation/index.html">Get and install NEST</a></li>
<li><a href="ref_material/pynest_apis.html">Access PyNEST APIs</a></li>
<li><a href= "release_notes/v3.0/refguide_nest2_nest3.html">Convert script from NEST 2.x to 3.x</a></li>
</ul>
</div>
</section>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ parameters associated with the distribution can be set (for example
nest.Connect(epop1, neuron, "all_to_all", syn_dict)

Available distributions and associated parameters are described in
:ref:`Connection Managementi <connection_management>`, the most common
:ref:`Connection Management <connection_management>`, the most common
ones are:

+-------------------+------------------------+
Expand Down
4 changes: 2 additions & 2 deletions models/aeif_psc_alpha.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ The following parameters can be set in the status dictionary.
I_in pA Inhibitory synaptic current
dI_in pA/ms First derivative of I_in
w pA Spike-adaptation current
g pa Spike-adaptation current
g pA Spike-adaptation current
======== ======= =======================================

======== ======= =======================================
Expand All @@ -128,7 +128,7 @@ The following parameters can be set in the status dictionary.
======== ======= ==================================
**Spike adaptation parameters**
---------------------------------------------------
a ns Subthreshold adaptation
a nS Subthreshold adaptation
b pA Spike-triggered adaptation
Delta_T mV Slope factor
tau_w ms Adaptation time constant
Expand Down
8 changes: 6 additions & 2 deletions models/glif_cond.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,12 @@ parameter setting of voltage_reset_fraction and voltage_reset_add may lead to th
situation that voltage is bigger than threshold after reset. In this case, the neuron
will continue to spike until the end of the simulation regardless the stimulated inputs.
We recommend the setting of the parameters of these three models to follow the
condition of :math:`(E_L + voltage_reset_fraction * ( V_th - E_L ) + voltage_reset_add)
< (V_th + th_spike_add)`.
condition of

.. math::

E_L + \mathrm{voltage_reset_fraction} \cdot \left( V_\mathrm{th} - E_L \right)
+ \mathrm{voltage_reset_add} < V_\mathrm{th} + \mathrm{th_spike_add}

Parameters
++++++++++
Expand Down
2 changes: 1 addition & 1 deletion models/noise_generator.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ changes must be a multiple of the time step.

You can use a :doc:`multimeter <multimeter>` to record the average current sent to all targets for each time step
if simulating on a single thread; multiple MPI processes with one thread each also work. In this case,
the recording interval of the multimeter should be the equal to the simulation resolution to avoid confusing effects
the recording interval of the multimeter should be equal to the simulation resolution to avoid confusing effects
due to offset or drift between the recording times of the multimeter and the switching times of the
noise generator. In multi-threaded mode, recording of noise currents is prohibited for technical reasons.

Expand Down