Added HHI index for each type and source

plus expected HHI for GDP and population