Dispersive and di usive-dispersive shock waves for non