added optimisation problems, fixed some bugs
note that VS2012 compiler cannot be used since it doesn't support maps initialized via curly brackets

Signed-off-by: Wolff Bock von Wülfingen <wuelfingen@sra.uni-hannover.de>