|
4 | 4 | The currently implemented time-series include:
|
5 | 5 | + TIMESERIES::Const: A constant value.
|
6 | 6 | + TIMESERIES::PulseRect: A rectangular pulse train.
|
| 7 | + + TIMESERIES::PulseSine: A pulsed sine wave. |
| 8 | + + TIMESERIES::PulseSigmoid: A sigmoidal pulse train. |
7 | 9 | + TIMESERIES::White: Gaussian amplitude distribution white noise.
|
8 | 10 | + TIMESERIES::WhiteCoherent: .
|
9 | 11 | + TIMESERIES::PAS: Paired Associative Stimulation.
|
10 | 12 | + TIMESERIES::Burst: .
|
11 |
| - + TIMESERIES::PulseSine: A pulsed sine wave. |
12 | 13 |
|
13 | 14 | Multiple `Timeseries` can be combined using the `Superimpose` keyword in
|
14 | 15 | the configuration file.
|
@@ -62,16 +63,7 @@ void Timeseries::init( Configf& configf ) {
|
62 | 63 | }
|
63 | 64 |
|
64 | 65 | // Get any user specified Node indices to apply stimulus.
|
65 |
| - vector<double> temp_node; |
66 |
| - //TODO: should be vector<size_type>. |
67 |
| - // The existing use of double is due to a limitation of the |
68 |
| - // Configf which has only one member function, numbers(), for |
69 |
| - // reading multiple numbers. This member returns a vector of |
70 |
| - // doubles. This should be corrected by renaming numbers() to |
71 |
| - // something like read_doubles() and adding a new member |
72 |
| - // function for reading and returning unsigned int like size_type. |
73 |
| - // Only two should be required as indices(size_type) and doubles |
74 |
| - // are the only type of content we specify in vectors... |
| 66 | + vector<double> temp_node; //TODO(stuart-knock): Should be vector<size_type>, see issue #142 on GitHub. |
75 | 67 | if( configf.next("Node") ) {
|
76 | 68 | temp_node = configf.numbers();
|
77 | 69 | }
|
@@ -160,18 +152,6 @@ void Timeseries::step() {
|
160 | 152 | }
|
161 | 153 | }
|
162 | 154 |
|
163 |
| -//TODO: The replication of timeseries to a vector length nodes for Q is |
164 |
| -// redundant when there is no explicit space to them. A single number |
165 |
| -// would be all that needs to be returned with mapping to nodes done |
166 |
| -// in Timeseries::fire(). The exception is for noise, where we want a |
167 |
| -// different random sequence at each point in space and typically it |
168 |
| -// is applied to all nodes anyway. To maintain a consistent interface, |
169 |
| -// it is probably best to have the vector returned by the individual |
170 |
| -// TIMESERIES fire() methods be of length the number of nodes that the |
171 |
| -// stimulus will be applied to... This becomes more important for higher |
172 |
| -// resolution surfaces, where currently applying a stimulus to a single |
173 |
| -// node of a 1000x1000 surface will produce a million element vector, |
174 |
| -// rather than the single number that is required... |
175 | 155 |
|
176 | 156 | /** @brief Contains time-series that can be combined to form a stimulus.
|
177 | 157 |
|
@@ -336,10 +316,6 @@ namespace TIMESERIES {
|
336 | 316 | Q.assign(nodes, amp*sin( 2.0 * M_PI * t * freq));
|
337 | 317 | }
|
338 | 318 |
|
339 |
| -// TODO: get reference and review noise normalisation for White*, seems like |
340 |
| -// it will at best only work for square grid... need, at least, access |
341 |
| -// to longside here. |
342 |
| - |
343 | 319 | /** @brief Initialises white noise.*/
|
344 | 320 | void White::init( Configf& configf ) {
|
345 | 321 | // Mean: 1 Std: 1 Ranseed: 1
|
|
0 commit comments