XP per hour - walking and catching vs. battling gyms

What gives more XP per hour:
A) Walking around and catching mons
B) Standing around and battling gyms

Those are the only two options. Don't bring up eggs or mass evolutions. Those are great XP, but they require preparation and can't just be done anytime, while the two above can..