Added scaling for evaluation. Also added time measurement tests to test.cc
Time measuring for ana_rect
Small change to test.cc
merged fixed evaluation