FHWS/Indoor
Archived
4
0
Fork 0
Code Issues 19 Pull Requests Releases 1 Wiki Activity

small changes so it works with yasmin

Browse Source
This commit is contained in:
toni
2018-07-19 10:29:51 +02:00
parent 74a424b555
commit db7c0e310e
5 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
smc/filtering/resampling/ParticleFilterResamplingPercent.h
View File

@@ -50,21 +50,17 @@ namespace SMC {
for (uint32_t i = start; i < end; ++i) { for (uint32_t i = start; i < end; ++i) {
const int rnd = dist(gen); const int rnd = dist(gen);
particles[i] = particles[rnd]; particles[i] = particles[rnd];
particles[i].weight /= 2; //particles[i].weight /= 2;
particles[rnd].weight /= 2; //particles[rnd].weight /= 2;
} }
// calculate weight-sum // calculate weight-sum
double weightSum = 0; double weightSum = 0;
for (const auto& p : particles) { double equalweight = 1.0 / (double) cnt;
for (auto& p : particles) {
weightSum += p.weight; weightSum += p.weight;
p.weight = equalweight;
} }
int i = 0;
} }
private: private:

4
smc/filtering/resampling/ParticleFilterResamplingSimpleImpoverishment.h
View File

@@ -77,8 +77,8 @@ namespace SMC {
// slight chance to get a truely random particle in range X m // slight chance to get a truely random particle in range X m
if (distNewOne(gen) < 0.001) { if (distNewOne(gen) < 0.001) {
const double radius = 50.0; const double radius = 50.0;
const NM::NavMeshSub<Tria> reachable(particlesCopy[i].state.pos, radius); const NM::NavMeshSub<Tria> reachable(particlesCopy[i].state.loc, radius);
particles[i].state.pos = reachable.getRandom().drawWithin(particlesCopy[i].state.pos.pos, radius); particles[i].state.loc = reachable.getRandom().drawWithin(particlesCopy[i].state.loc.pos, radius);
particles[i].weight = equalWeight; particles[i].weight = equalWeight;
continue; continue;
} }

2
tests/math/dsp/TestFIRComplex.cpp
View File

@@ -2,7 +2,7 @@
#include <fstream> #include <fstream>
#include "../../Tests.h" #include "../../Tests.h"
#include "../../../math/dsp/FIRComplex.h" #include "../../../math/dsp/fir/Complex.h"
#include <random> #include <random>