AUGMENTED SPACE FORMALISM FOR DIAGONAL AND OFF-DIAGONAL DISORDERED ALLOYS