completed Sinclair/Wilks calculator