MachineJobShop and QueueJobShop updated so that they can act as jobshop objects both in input and output. topologies 18 to 20 updated in the new notation