A device and method for improving the accuracy of angle of arrival and departure computations is disclosed. The device and method rely on manipulation of the antenna switching pattern to achieve an improved calculation of arrival angle. In one embodiment, the device calculates an estimate angle of arrival using conventional methods. The device then determines which of a plurality of different antenna switching pattern yields the more accurate results at this estimated angle of arrival. The AoA measurement is then repeated using the preferred antenna switching pattern. In another embodiment, the device captures the amplitude and/or phase of the signal from each antenna element. The device then sorts these antenna elements and defines a preferred antenna switching pattern based on the sort list. The AoA measurement is then performed using the preferred antenna switching pattern. In another embodiment, neural networks may be utilized to determine the preferred antenna switching pattern.