Ion-acoustic solitons and double-layers in a plasma consisting of positive and negative ions with non-thermal electrons