Well, you certainly don't calculate a 2-stroke engine's displacement using any formula that includes the number of revolutions/strokes per combusion cycle, JUST the actual displacement of the combustion chamber's volume per stroke. So, calculating a rotary engine's displacement (in my opinion) should only be based on a formula determining the displacment of each combustion chamber's volume, multiplied by the number of combustion sections.
(do I have that right?)