An Enhanced Goal-Oriented Decision-Making Model for Self-Adaptive Systems