FHWS/YASMIN
Archived
3
0
Fork 0
Code Issues 12 Pull Requests Releases Wiki Activity

added c++11 fixes

Browse Source 
removed old components
disabled activity (for compiling reasons)
added wifi 2.4ghz hack
This commit is contained in:
k-a-z-u
2018-07-11 13:23:18 +02:00
parent b0712ec005
commit bb974d3871
18 changed files with 107 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nav/Filter.h
View File

@@ -167,20 +167,21 @@ public:
}
double getStairProb(const K::Particle<MyState>& p, const ActivityButterPressure::Activity act) {
double getStairProb(const K::Particle<MyState>& p, const Activity act) {
const float kappa = 0.75;
const MyGridNode& gn = grid->getNodeFor(p.state.position);
switch (act) {
case ActivityButterPressure::Activity::STAY:
case Activity::STANDING:
case Activity::WALKING:
if (gn.getType() == GridNode::TYPE_FLOOR) {return kappa;}
if (gn.getType() == GridNode::TYPE_DOOR) {return kappa;}
{return 1-kappa;}
case ActivityButterPressure::Activity::UP:
case ActivityButterPressure::Activity::DOWN:
case Activity::WALKING_UP:
case Activity::WALKING_DOWN:
if (gn.getType() == GridNode::TYPE_STAIR) {return kappa;}
if (gn.getType() == GridNode::TYPE_ELEVATOR) {return kappa;}
{return 1-kappa;}