bert/research-project
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More consistent data loading.

Browse Source
This commit is contained in:
Bert Peters
2018-01-02 16:35:41 +01:00
parent 5f81f0cec2
commit cb16b2f794
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.cpp
View File

@@ -26,9 +26,11 @@ struct
vector<unique_ptr<LayerVisualisation>> layerVisualisations; vector<unique_ptr<LayerVisualisation>> layerVisualisations;
} rendererData; } rendererData;
static vector<vector<LayerData>> getSimulationData(const Options &options) static void loadSimulationData(const Options &options)
{ {
vector<vector<LayerData>> results; vector<vector<LayerData>> &results = rendererData.data;
results.clear();
auto dumper = options.imageDumper(); auto dumper = options.imageDumper();
Simulator simulator(options.model(), options.weights(), options.means()); Simulator simulator(options.model(), options.weights(), options.means());
rendererData.layerInfo = simulator.layerInfo(); rendererData.layerInfo = simulator.layerInfo();
@@ -44,8 +46,6 @@ static vector<vector<LayerData>> getSimulationData(const Options &options)
dumper->dump(layer); dumper->dump(layer);
} }
} }
return results;
} }
static void renderLayerName(const LayerData &data); static void renderLayerName(const LayerData &data);
@@ -152,7 +152,7 @@ int main(int argc, char *argv[])
// Prepare data for simulations // Prepare data for simulations
Options options = Options::parse(argc, argv); Options options = Options::parse(argc, argv);
rendererData.labels = options.labels(); rendererData.labels = options.labels();
rendererData.data = getSimulationData(options); loadSimulationData(options);
// Register callbacks // Register callbacks
glutDisplayFunc(render); glutDisplayFunc(render);