refactor entropy estimate just a tad in Matching

Tested on darcy.

optimized fractal algorithm took 30.8 seconds
refactor entropy estimation yet further

Tested on darcy.

optimized fractal algorithm took 31.07 seconds
work a bit more on entropy estimation.

Tested on darcy.

optimized fractal algorithm took 32.92 seconds