Comment to Brahmachari
-
A self realized person who is sexually involved is a rishi.
One who is not sexually involved is a swami.
However these meanings do not apply is every case, as various sects define the terms in their particular usage.
A yogi is anyone who practices yoga but one has to check on the definition of yoga. For inSelf Yoga, the terms means the process explained by Patanjali in his Yoga Sutras. This person may or may not be sexually involved but he/she is required to curtail or cease sexual activity.