toni/IPIN2016
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added activity recognition to smoothing transition

Browse Source
This commit is contained in:
toni
2016-04-26 10:12:10 +02:00
parent ed8e37108a
commit f7e817d5e4
13 changed files with 204 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
code/main.cpp
View File

@@ -72,7 +72,7 @@ void testModelWalk() {
while(true) {
for (GridWalkState<MyGridNode>& state : states) {
state = walk.getDestination(grid, state, std::abs(wDist.draw()), wHead.draw());
state = walk.getDestination(grid, state, std::abs(wDist.draw()), wHead.draw(), Activity::UNKNOWN);
}
usleep(1000*80);
vis.showStates(states);
@@ -88,9 +88,18 @@ void testModelWalk() {
int main(void) {
// testModelWalk();
// SmoothingEval1 eval;
// eval.fixedIntervallSimpleTransPath4();
// eval.run();
{SmoothingEval1 eval;
eval.fixedIntervallSimpleTransPath4();
eval.run();}
{SmoothingEval1 eval;
eval.fixedIntervallSimpleTransPath4();
eval.run();}
{SmoothingEval1 eval;
eval.fixedIntervallSimpleTransPath4();
eval.run();}
{SmoothingEval1 eval;
eval.fixedIntervallSimpleTransPath4();
eval.run();}
//Eval1 eval;
//eval.bergwerk_path4_nexus_multi();
@@ -98,41 +107,41 @@ int main(void) {
//{SmoothingEval1 eval; eval.bergwerk_path1_nexus_simple(); eval.run();}
//{SmoothingEval1 eval; eval.bergwerk_path1_nexus_imp(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path1_nexus_multi(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path1_nexus_shortest(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path1_nexus_multi(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path1_nexus_shortest(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path2_nexus_simple(); eval.run();}
//{SmoothingEval1 eval; eval.bergwerk_path2_nexus_imp(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path2_nexus_multi(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path2_nexus_shortest(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path2_nexus_simple(); eval.run();}
// //{SmoothingEval1 eval; eval.bergwerk_path2_nexus_imp(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path2_nexus_multi(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path2_nexus_shortest(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path3_nexus_simple(); eval.run();}
//{SmoothingEval1 eval; eval.bergwerk_path3_nexus_imp(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path3_nexus_multi(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path3_nexus_shortest(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path3_nexus_simple(); eval.run();}
// //{SmoothingEval1 eval; eval.bergwerk_path3_nexus_imp(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path3_nexus_multi(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path3_nexus_shortest(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path4_nexus_simple(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path4_nexus_imp(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path4_nexus_multi(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path4_nexus_shortest(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path4_nexus_simple(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path4_nexus_imp(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path4_nexus_multi(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path4_nexus_shortest(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path1_galaxy_simple(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path1_galaxy_multi(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path1_galaxy_shortest(); eval.run();}
//// {SmoothingEval1 eval; eval.bergwerk_path1_galaxy_simple(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path1_galaxy_multi(); eval.run();}
//// {SmoothingEval1 eval; eval.bergwerk_path1_galaxy_shortest(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path2_galaxy_simple(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path2_galaxy_multi(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path2_galaxy_shortest(); eval.run();}
//// {SmoothingEval1 eval; eval.bergwerk_path2_galaxy_simple(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path2_galaxy_multi(); eval.run();}
//// {SmoothingEval1 eval; eval.bergwerk_path2_galaxy_shortest(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path3_galaxy_simple(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path3_galaxy_multi(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path3_galaxy_shortest(); eval.run();}
//// {SmoothingEval1 eval; eval.bergwerk_path3_galaxy_simple(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path3_galaxy_multi(); eval.run();}
//// {SmoothingEval1 eval; eval.bergwerk_path3_galaxy_shortest(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path4_galaxy_simple(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path4_galaxy_multi(); eval.run();}
{SmoothingEval1 eval; eval.bergwerk_path4_galaxy_shortest(); eval.run();}
//// {SmoothingEval1 eval; eval.bergwerk_path4_galaxy_simple(); eval.run();}
// {SmoothingEval1 eval; eval.bergwerk_path4_galaxy_multi(); eval.run();}
//// {SmoothingEval1 eval; eval.bergwerk_path4_galaxy_shortest(); eval.run();}