Use the new layer info data in the simulator.

This commit is contained in:
2018-01-02 16:31:55 +01:00
parent 470399aabf
commit 5f81f0cec2
6 changed files with 13 additions and 45 deletions

View File

@@ -20,6 +20,7 @@ using namespace fmri;
struct
{
optional<vector<string>> labels;
map<string, LayerInfo> layerInfo;
vector<vector<LayerData>> data;
vector<vector<LayerData>>::iterator currentData;
vector<unique_ptr<LayerVisualisation>> layerVisualisations;
@@ -30,6 +31,7 @@ static vector<vector<LayerData>> getSimulationData(const Options &options)
vector<vector<LayerData>> results;
auto dumper = options.imageDumper();
Simulator simulator(options.model(), options.weights(), options.means());
rendererData.layerInfo = simulator.layerInfo();
for (const auto &image : options.inputs()) {
results.emplace_back(simulator.simulate(image));