Separated self- and neighbor-interaction terms