push for merge

This commit is contained in:
toni
2016-04-21 09:02:18 +02:00
parent 033466111a
commit b6532dbe7f
5 changed files with 54 additions and 53 deletions

View File

@@ -88,51 +88,51 @@ void testModelWalk() {
int main(void) {
// testModelWalk();
SmoothingEval1 eval;
eval.fixedIntervallSimpleTransPath4();
eval.run();
// SmoothingEval1 eval;
// eval.fixedIntervallSimpleTransPath4();
// eval.run();
//Eval1 eval;
//eval.bergwerk_path4_nexus_multi();
//eval.run();
// {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_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_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();}