large merge for kde 3d

This commit is contained in:
toni
2018-08-01 11:13:53 +02:00
4 changed files with 27 additions and 20 deletions

View File

@@ -171,7 +171,7 @@ Stats::Statistics<float> run(Settings::DataSetup setup, int numFile, std::string
auto trans = std::make_unique<MyPFTrans>(mesh, *wifiModel);
//auto resample = std::make_unique<SMC::ParticleFilterResamplingSimple<MyState>>();
auto resample = std::make_unique<SMC::ParticleFilterResamplingKDE<MyState, MyNavMeshTriangle>>(mesh, Settings::KDE3D::gridSize, Settings::KDE3D::bandwidth);
auto resample = std::make_unique<SMC::ParticleFilterResamplingKDE<MyState, MyNavMeshTriangle>>(&mesh, Settings::KDE3D::gridSize, Settings::KDE3D::bandwidth);
//auto resample = std::make_unique<SMC::ParticleFilterResamplingSimpleImpoverishment<MyState, MyNavMeshTriangle>>();
//auto resample = std::make_unique<SMC::ParticleFilterResamplingKLD<MyState>>();
@@ -262,11 +262,11 @@ Stats::Statistics<float> run(Settings::DataSetup setup, int numFile, std::string
plot.showParticles(pf.getParticles());
plot.setCurEst(est.pos.pos);
//plot.setGroundTruth(gtPos);
plot.setGroundTruth(gtPos);
plot.addEstimationNode(est.pos.pos);
plot.setActivity((int) act.get());
//plot.plot();
plot.plot();
// error calc
// float err_m = gtPos.getDistance(est.pos.pos);
@@ -282,15 +282,16 @@ Stats::Statistics<float> run(Settings::DataSetup setup, int numFile, std::string
errorFile << ts.ms() << " " << err_m << "\n";
plot.gp << "set terminal png size 1280,720\n";
plot.gp.setOutput("/tmp/videoSparkasse/" + std::to_string(i++) + ".png");
//stuff for drawing
// plot.gp << "set terminal png size 1280,720\n";
// plot.gp.setOutput("/tmp/videoSparkasse/" + std::to_string(i++) + ".png");
int degree = ((30 - i) % 360);
if (degree < 0){degree += 360;}
plot.gp << "set view 63,"<< degree << "\n";
plot.gp << "set autoscale xy\n";
plot.gp << "set autoscale z\n";
plot.plot();
// int degree = ((30 - i) % 360);
// if (degree < 0){degree += 360;}
// plot.gp << "set view 63,"<< degree << "\n";
// plot.gp << "set autoscale xy\n";
// plot.gp << "set autoscale z\n";
// plot.plot();
}
}
@@ -357,8 +358,7 @@ int main(int argc, char** argv) {
Stats::Statistics<float> statsQuantil;
Stats::Statistics<float> tmp;
//Path2_Museum_KDE_SimpleResampling
std::string evaluationName = "museum/videoSparkasse";
std::string evaluationName = "museum/tmp";
for(int i = 0; i < 1; ++i){