commit before new model is implemented

This commit is contained in:
toni
2018-01-17 13:19:16 +01:00
parent bea81eab62
commit f4c598299f
6 changed files with 152 additions and 241 deletions

View File

@@ -22,7 +22,7 @@
#include <KLib/misc/gnuplot/GnuplotSplotElementPoints.h>
#include <KLib/misc/gnuplot/GnuplotSplotElementColorPoints.h>
#include <KLib/math/filter/particles/ParticleFilter.h>
#include <Indoor/smc/filtering/ParticleFilter.h>
struct Plotti {
@@ -112,7 +112,7 @@ struct Plotti {
estPathSmoothed.add(est);
}
void debugDistribution1(std::vector<K::Particle<MyState>> samples){
void debugDistribution1(std::vector<SMC::Particle<MyState>> samples){
float min = +9999;
float max = -9999;
@@ -133,7 +133,7 @@ struct Plotti {
gp << "set cbrange [" << min << ":" << max << "]\n";
}
void debugDistribution2(std::vector<K::Particle<MyState>> samples){
void debugDistribution2(std::vector<SMC::Particle<MyState>> samples){
float min = +9999;
float max = -9999;
@@ -299,10 +299,10 @@ struct Plotti {
}
}
template <typename State> void addParticles(const std::vector<K::Particle<State>>& particles) {
template <typename State> void addParticles(const std::vector<SMC::Particle<State>>& particles) {
pParticles.clear();
int i = 0;
for (const K::Particle<State>& p : particles) {
for (const SMC::Particle<State>& p : particles) {
if (++i % 25 != 0) {continue;}
K::GnuplotPoint3 pos(p.state.position.x_cm, p.state.position.y_cm, p.state.position.z_cm);
pParticles.add(pos / 100.0f);