added path 2 for eval instead path 3

This commit is contained in:
toni
2016-05-09 15:04:37 +02:00
parent 89f764e22f
commit 5a3677e139
42 changed files with 18072 additions and 13 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.6.0, 2016-05-06T02:46:46. -->
<!-- Written by QtCreator 3.6.0, 2016-05-09T01:57:30. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>

View File

@@ -17,11 +17,11 @@ namespace MiscSettings {
const int timeSteps = 500;
const int numParticles = 500;
const int numParticles = 2500;
const int numBSParticles = 100;
const int numBSParticles = 500;
const int lag = 5;
const int lag = 30;
const int fixedLagGap = 1;

View File

@@ -46,7 +46,7 @@ public:
//pf->setResampling( std::unique_ptr<K::ParticleFilterResamplingPercent<MyState>>(new K::ParticleFilterResamplingPercent<MyState>(0.10)) );
// state estimation step
pf->setEstimation( std::unique_ptr<K::ParticleFilterEstimationWeightedAverageWithAngle<MyState>>(new K::ParticleFilterEstimationWeightedAverageWithAngle<MyState>()));
pf->setEstimation( std::unique_ptr<K::ParticleFilterEstimationWeightedAverage<MyState>>(new K::ParticleFilterEstimationWeightedAverage<MyState>()));
//pf->setEstimation( std::unique_ptr<K::ParticleFilterEstimationRegionalWeightedAverage<MyState>>(new K::ParticleFilterEstimationRegionalWeightedAverage<MyState>()));
//pf->setEstimation( std::unique_ptr<K::ParticleFilterEstimationOrderedWeightedAverage<MyState>>(new K::ParticleFilterEstimationOrderedWeightedAverage<MyState>(0.50f)));
@@ -57,7 +57,7 @@ public:
bf->setSampler( std::unique_ptr<K::CumulativeSampler<MyState>>(new K::CumulativeSampler<MyState>()));
bool smoothing_resample = false;
//bf->setNEffThreshold(1.0);
//Smoothing using Simple Trans
bf->setEstimation(std::unique_ptr<K::ParticleFilterEstimationWeightedAverage<MyState>>(new K::ParticleFilterEstimationWeightedAverage<MyState>()));