Modified solver add constraint extensions to allow variables with any name (bound by order)

Signed-off-by: Martin Evans <martindevans@gmail.com>