Permalink
Browse files

Moved RNGs into the population to reduce memory consumption.

Removed the unneeded plotting functions.
  • Loading branch information...
1 parent af573b3 commit 30534a99d6db408485a7b78db08addb0d6d7774a @miscco committed Mar 1, 2014
Showing with 74 additions and 2,132 deletions.
  1. +3 −9 Main.cpp
  2. +0 −462 MersenneTwister.h
  3. +19 −3 ODE.h
  4. BIN Spindle.png
  5. +13 −9 Thalamic_Column.cpp
  6. +22 −8 Thalamic_Column.h
  7. +5 −35 Thalamus.cpp
  8. BIN Thalamus.mexa64
  9. +0 −1,057 exportfig.m
  10. +2 −1 parameters.h
  11. +0 −19 poster_plot.m
  12. +0 −94 randoms.h
  13. +0 −288 savefig.m
  14. +10 −23 saves.h
  15. +0 −124 tightfig.m
View
@@ -4,7 +4,6 @@
#include <iostream>
#include <ctime>
#include <vector>
-#include "randoms.h"
#include "Thalamic_Column.h"
#include "ODE.h"
@@ -17,12 +16,8 @@ extern const double h = sqrt(dt);
// simulation of the thalamic model
int main(void) {
- // Initializing the mersenne twister.
- MTRand mtrand;
-
- // creating the random input
- vector<double> u_t1 = rand_inp(mtrand, res, T, 0, 10, 1E3, phi_st, phi_st, phi_inp);
- vector<double> u_t2 = rand_inp(mtrand, res, T, 0, 10, 1E3, phi_st, phi_st, phi_inp);
+ // Initializing the seeder.
+ srand(time(0));
// Initializing the populations;
Thalamic_Column Col;
@@ -33,8 +28,7 @@ int main(void) {
// simulation
for (int t=0; t< T*res; ++t) {
- ODE (Col, u_t1[t], u_t2[t]);
- //ODE2(Col, u_t1[t]);
+ ODE (Col);
}
time (&end);
Oops, something went wrong.

0 comments on commit 30534a9

Please sign in to comment.