Put comparator into SampleData class
Using high performance makefile settings again as default
added various other sizes of sibenik for testing