[AdgADim] Using CpmlPair instead of AdgPair
[AdgADim] Using CpmlPair instead of AdgPair

This does not change anything at a logical level, but the use of a single
data type for pairs improves data consistency.

ntd/adg,ntd/adg