Adaptive Niche-Radii and Niche-Shapes Approaches for Niching with the CMA-ES