unify code in simulation classes

Merge request reports

Loading