Improving the Predictions of Ship Speed and Fuel Consumption for Heavy Lift Vessels