Improved position count constraint to avoid assets being selected and counting...

The discrete portfolio optimisation model which computes the optimal portfolio to hold, instead of the optimal portfolio changes to apply to the initial portfolio, is easier to model and implement. Hence, we decided to keep it as the model we will continue work on.