Comparing students’ self-discipline and self-regulation measures and their prediction of academic achievement