Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manage memory with unique_ptr in sg.cpp. Also couple of fixes. #183

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Manage memory with unique_ptr in sg.cpp. Also couple of fixes. #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions examples/SimpsonGoodhill/sg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <string>
#include <vector>
#include <array>
#include <memory>

#include <morph/vec.h>
#include <morph/CartGrid.h>
Expand All @@ -29,7 +30,6 @@ struct SimpsonGoodhill
this->conf = cfg;
this->init();
}
~SimpsonGoodhill() { delete this->retina; }

void run()
{
Expand Down Expand Up @@ -94,7 +94,7 @@ struct SimpsonGoodhill
T gr_denom = rgcside-1;
T gr = T{1}/gr_denom;
std::cout << "Grid element length " << gr << std::endl;
this->retina = new morph::CartGrid(gr, gr, 0.0f, 0.0f, 0.95f, 0.95f);
this->retina = std::make_unique<morph::CartGrid>(gr, gr, 0.0f, 0.0f, 0.95f, 0.95f);
this->retina->setBoundaryOnOuterEdge();
std::cout << "Retina has " << this->retina->num() << " cells\n";
this->branches.resize(this->retina->num() * bpa);
Expand Down Expand Up @@ -166,13 +166,14 @@ struct SimpsonGoodhill

// Show a vis of the retina, to compare positions/colours
offset[0] += 1.3f;
auto cgv = std::make_unique<morph::CartGridVisual<float>>(retina, offset);
auto cgv = std::make_unique<morph::CartGridVisual<float>>(this->retina.get(), offset);
v->bindmodel (cgv);
cgv->cartVisMode = morph::CartVisMode::RectInterp;
std::vector<morph::vec<float, 3>> points = this->retina->getCoordinates3();
cgv->setVectorData (&points);
cgv->cm.setType (morph::ColourMapType::Duochrome);
cgv->cm.setHueRG();
cgv->zScale.setParams (0.0f, 0.0f); // make retina visual flat
cgv->addLabel ("Retina", {0.0f, 1.1f, 0.0f});
cgv->finalize();
v->addVisualModel (cgv);
Expand All @@ -193,7 +194,7 @@ struct SimpsonGoodhill
// Access to a parameter configuration object
morph::Config* conf;
// rgcside^2 RGCs, each with bpa axon branches growing.
morph::CartGrid* retina;
std::unique_ptr<morph::CartGrid> retina;
// Parameters vecto (See Table 2 in the paper)
morph::vec<T, 4> m = { T{0.02}, T{0.2}, T{0.15}, T{0.1} };
// The centre coordinate
Expand Down Expand Up @@ -227,6 +228,9 @@ int main (int argc, char **argv)
std::cerr << "Failed to read config " << paramsfile << ". Exiting.\n";
return 1;
}
if (conf.getBool ("movie", false) == true) {
std::filesystem::create_directories ("./frames");
}
SimpsonGoodhill<float> model (&conf);
model.run();

Expand Down
2 changes: 1 addition & 1 deletion examples/SimpsonGoodhill/sg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"desc_movie" : "If true, then save images to make a movie",
"desc_movie" : "If true, then save images (into ./frames/) to make a movie",
"movie" : true,
"win_width" : 1920,
"desc_goslow" : "If true, then slow down the visualisation to make it watchable",
Expand Down