minor update
fix set based evaluation
rename Evaluation class
fixing free variable bug
modifying set-based evaluation