Equivalent definitions for non-equilibrium entropy