Off by one error in measure step_values when _SKIP_ is true

[macumber]

Issue overview

When adding measures to a workflow, there is a special SKIP argument that can be used to skip running a measure. Setting SKIP to true results in step_values being added to the wrong measure in the out.osw file for subsequent measures in the workflow.

Current Behavior

step_values are associated with the wrong measure in out.osw when a measure is skipped

Expected Behavior

step_values should be associated with the correct measure in out.osw when a measure is skipped

Steps to Reproduce

1. Unzip MixedUpStepsSkip.zip
2. openstudio.exe run -w workflow.osw
3. The step_results should be associated with the correct measure indexes but they are off by one when a measure is skipped
4. Additionally, [openstudio.measure.OSRunner] <Error> Not prepared for step is shown when measure is skipped

Possible Solution

Details

Environment

Some additional details about your environment for this issue (if relevant):

• Platform (Operating system, version): Windows 11
• Version of OpenStudio (if using an intermediate build, include SHA): 3.7.0

Context

Parsing of results in out.osw file broken for test suite

[macumber]

This does not affect the classic CLI.

[jmarrec]

Aren't TODOs a great way to remind you to finish something and never actually do it?

OpenStudio/src/workflow/ApplyMeasure.cpp

Line 42 in b809318

// TODO: handling of SKIP is incomplete here, will need to increment the runner and co, and not process the measure

Edit: hem, I thought I did it though here:

OpenStudio/src/workflow/ApplyMeasure.cpp

Lines 78 to 89 in b809318

	const bool skip_measure = isStepMarkedSkip(stepArgs);
	if (skip_measure || runner.halted()) { // TODO: or halted
	if (!energyplus_output_requests) {
	if (runner.halted()) {
	LOG(Info, fmt::format("Skipping measure '{}' because simulation halted", measureDirName));
	} else {
	LOG(Info, fmt::format("Skipping measure '{}'", measureDirName));
	WorkflowStepResult result = runner.result();
	runner.incrementStep();
	// addResultMeasureInfo(result, bclMeasure); // TODO: Should I really instantiate the BCLMeasure just for this?
	result.setStepResult(StepResult::Skip);
	}

[jmarrec]

Ok yeah, I need to prepareForMeasureRun before I can set the step Result and increment the step

[jmarrec]

c6ff09c fixes it. I tested locally.

[macumber]

Thanks @jmarrec !