Combined diesel-electric or gas