Find x and s where sin(x) = sin(2x+s)+1, cos(x) = cos(2x+s)