Added code for generating structure graphs and finding a matching between variables and constraints