THE SOLITARY WAVE AND PERIODIC WAVES IN SHALLOW WATER