A Reorganization of The Building-By-Building Energy Graph