Skip to content

Commit 10b88a2

Browse files
authored
Merge pull request #2787 from aoot/master
Fix various typos in the documentation
2 parents fa9eb7f + ed6f318 commit 10b88a2

10 files changed

Lines changed: 36 additions & 19 deletions

File tree

doc/htmldoc/devices/record_from_simulations.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ kernel attribute ``recording_backends``.
101101

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

106106
::
107107

doc/htmldoc/nest_behavior/running_simulations.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ In linear simulation scripts that build a network, simulate it, carry
8282
out some post-processing and exit, the user does not have to worry about
8383
the delay extrema *dmin* and *dmax* as they are set automatically to the
8484
correct values. However, NEST also allows subsequent calls
85-
to\ :py:func:`.Simulate`, which only work correctly if the content of the spike
85+
to :py:func:`.Simulate`, which only work correctly if the content of the spike
8686
buffers is preserved over the simulations.
8787

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

128-
NEST also has a some models that determine the precise time of the
128+
NEST also has some models that determine the precise time of the
129129
threshold crossing during the interval. Please see the documentation on
130130
:ref:`precise spike time neurons <sim_precise_spike_times>`
131131
for details about neuron update in continuous time and the

doc/htmldoc/neurons/parametrization.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ others can be used when connecting.
167167
spatial_nodes = nest.Create('iaf_psc_alpha', positions=positions)
168168
169169
parameter = -60 + nest.spatial.pos.x + (0.4 * nest.spatial.pos.x * nest.random.normal())
170-
spatial_nodes.set('V_m'=parameter)
170+
spatial_nodes.set(V_m=parameter)
171171
172172
node_pos = np.array(nest.GetPosition(spatial_nodes))
173173
node_pos[:,1]
@@ -252,7 +252,7 @@ parameter:
252252
fig, ax = pyplot.subplots(figsize=(12, 6))
253253
bars = ax.hist(targets, bins=N, edgecolor='black', linewidth=1.2)
254254
255-
pyplot.xticks(bars[1] + 0.5,np.arange(1, N+1))
255+
pyplot.xticks(bars[1] + 0.5,np.arange(1, N+2))
256256
ax.set_title('Connections from node with NodeID {}'.format(spatial_nodes[middle_node].get('global_id')))
257257
ax.set_xlabel('Target NodeID')
258258
ax.set_ylabel('Num. connections');
@@ -468,9 +468,9 @@ Using parameters makes it easy to set node properties
468468
| | |
469469
| :: | :: |
470470
| | |
471-
| for gid in nrns: | nrns.V_m=nest.random.uniform(-20., 20) |
472-
| v_m = numpy.random.uniform(-20., 20.) | |
473-
| nest.SetStatus([node_id], {'V_m': V_m}) | |
471+
| for gid in nrns: | nrns.V_m = nest.random.uniform(-20.0, 20.0) |
472+
| v_m = numpy.random.uniform(-20.0, 20.0) | |
473+
| nest.SetStatus(gid, {"V_m": v_m}) | |
474474
| | |
475475
| | |
476476
+-----------------------------------------------+----------------------------------------------------+

doc/htmldoc/synapses/connection_management.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Generator Interface and randomly connects 10% of the neurons from
150150
import csa
151151
cg = csa.cset(csa.random(0.1), 10000.0, 1.0)
152152
153-
# Map weight and delay indices to vaules from cg
153+
# Map weight and delay indices to values from cg
154154
params_map = {'weight': 0, 'delay': 1}
155155
156156
conn_spec_dict = {'rule': 'conngen', 'cg': cg, 'params_map': params_map}
@@ -359,7 +359,7 @@ fixed outdegree
359359
^^^^^^^^^^^^^^^
360360

361361
For rule ``fixed_outdegree`` the array has to be a two-dimensional
362-
NumPy array or Python list with shape ``(len(pre), outdegree)``, where
362+
NumPy array or Python list with shape ``(len(A), outdegree)``, where
363363
:hxt_ref:`outdegree` is the number of outgoing connections per source
364364
neuron. This means that the rows describe the source, while the
365365
columns represent the connections starting from the source neuron
@@ -765,7 +765,7 @@ given model.
765765
766766
To further customize the process of creating synapses, it is often
767767
useful to have the same basic synapse model available with different
768-
parametizations. To this end, :py:func:`.CopyModel` can be used to
768+
parametrizations. To this end, :py:func:`.CopyModel` can be used to
769769
create custom synapse types from already existing synapse types. In
770770
the simplest case, it takes the names of the existing model and the
771771
copied type to be created. The optional argument ``params`` allows to

doc/htmldoc/synapses/handling_connections.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ as NodeCollections.
4040
Printing
4141
Printing a SynapseCollection produces a table with source and target node IDs, synapse model, weight and delay.
4242
If your SynapseCollection has more than 36 elements, only the first and last 15 connections are displayed.
43-
To print all, first set ``print_all = True`` on your SynapseCollection.
43+
To print all, first set ``print_full = True`` on your SynapseCollection.
4444

4545
>>> nest.Connect(nodes[:2], nodes[:2])
4646
>>> synapses = nest.GetConnections()
@@ -52,7 +52,7 @@ Printing
5252
2 1 static_synapse 1.000 1.000
5353
2 2 static_synapse 1.000 1.000
5454

55-
>>> synapses.print_all = True
55+
>>> synapses.print_full = True
5656

5757
.. _conn_indexing:
5858

doc/htmldoc/templates/index.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,19 @@ <h1>Welcome to the NEST Simulator documentation!</h1>
6565
<a href="understand_index.html" class="buttonlink">How NEST works</a>
6666
</div>
6767
</div>
68+
69+
70+
<div class="accordion"> <img id="pulse" src="_static/img/pulse.svg" style="position:relative" />
71+
<pre><code class="language-python">
72+
import nest
73+
import matplotlib.pyplot as plt
74+
</code></pre>
75+
<div>
76+
<ul>
77+
<li><a href="installation/index.html">Get and install NEST</a></li>
78+
<li><a href="ref_material/pynest_apis.html">Access PyNEST APIs</a></li>
79+
<li><a href= "release_notes/v3.0/refguide_nest2_nest3.html">Convert script from NEST 2.x to 3.x</a></li>
80+
</ul>
6881
</div>
6982
</section>
7083

doc/htmldoc/tutorials/pynest_tutorial/part_3_connecting_networks_with_synapses.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ parameters associated with the distribution can be set (for example
119119
nest.Connect(epop1, neuron, "all_to_all", syn_dict)
120120

121121
Available distributions and associated parameters are described in
122-
:ref:`Connection Managementi <connection_management>`, the most common
122+
:ref:`Connection Management <connection_management>`, the most common
123123
ones are:
124124

125125
+-------------------+------------------------+

models/aeif_psc_alpha.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ The following parameters can be set in the status dictionary.
111111
I_in pA Inhibitory synaptic current
112112
dI_in pA/ms First derivative of I_in
113113
w pA Spike-adaptation current
114-
g pa Spike-adaptation current
114+
g pA Spike-adaptation current
115115
======== ======= =======================================
116116
117117
======== ======= =======================================
@@ -128,7 +128,7 @@ The following parameters can be set in the status dictionary.
128128
======== ======= ==================================
129129
**Spike adaptation parameters**
130130
---------------------------------------------------
131-
a ns Subthreshold adaptation
131+
a nS Subthreshold adaptation
132132
b pA Spike-triggered adaptation
133133
Delta_T mV Slope factor
134134
tau_w ms Adaptation time constant

models/glif_cond.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,12 @@ parameter setting of voltage_reset_fraction and voltage_reset_add may lead to th
103103
situation that voltage is bigger than threshold after reset. In this case, the neuron
104104
will continue to spike until the end of the simulation regardless the stimulated inputs.
105105
We recommend the setting of the parameters of these three models to follow the
106-
condition of :math:`(E_L + voltage_reset_fraction * ( V_th - E_L ) + voltage_reset_add)
107-
< (V_th + th_spike_add)`.
106+
condition of
107+
108+
.. math::
109+
110+
E_L + \mathrm{voltage_reset_fraction} \cdot \left( V_\mathrm{th} - E_L \right)
111+
+ \mathrm{voltage_reset_add} < V_\mathrm{th} + \mathrm{th_spike_add}
108112
109113
Parameters
110114
++++++++++

models/noise_generator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ changes must be a multiple of the time step.
8989
9090
You can use a :doc:`multimeter <multimeter>` to record the average current sent to all targets for each time step
9191
if simulating on a single thread; multiple MPI processes with one thread each also work. In this case,
92-
the recording interval of the multimeter should be the equal to the simulation resolution to avoid confusing effects
92+
the recording interval of the multimeter should be equal to the simulation resolution to avoid confusing effects
9393
due to offset or drift between the recording times of the multimeter and the switching times of the
9494
noise generator. In multi-threaded mode, recording of noise currents is prohibited for technical reasons.
9595

0 commit comments

Comments
 (0)