Made dvs dictionary an OrderedDict; thickness constraints are evaluated in squared form