Draft: misc improvement

misc improvement:

• test only in debug mode (cmake sense)
• some loop ending criteria with constant instead of method call
• dictionary (i.e. map or unorderedmap) interrogated only once by using find to find and test