Rewrote analytic_rank_upper_bound() methods to allow Delta scaling