Incorrect construction of the minimal cut set in EMV2

[MaksimPerepelitsa]

Summary
Error in constructing MCS for elements combined by the condition And

Expected behavior
Setting AND conditions in the component error specification results in their being combined into a cut set.

Actual behavior
Setting AND conditions in the component error specification does NOT combine them into a cut set.

Steps To Reproduce

1. Create the component according to the specification in the code block below
2. run the FTA analysis and select minimal cut set with calculated probabilities
3. get an INCORRECT result as shown in the screenshot below

process FMS
		features
			actuatorOut: out data port
		annex EMV2 {**
			use types ErrorLibrary;			
			error propagations
				actuatorOut: out propagation {ServiceError};
			end propagations;
			component error behavior
				events
					ev1 : error event;
					ev2 : error event;
				propagations
					pr1: all -[ev1 and ev2]->actuatorOut{ServiceError};
			end component;
end FMS;

Screenshots

Desktop (please complete the following information):

• OSATE Version: 2.15.0.vfinal -- Build id: 2024-10-16
• Operating System: Windows 10

[MaksimPerepelitsa]

I suggest removing the check || rootevent.GetType() == EventType.INTERMEDIATE

https://github.com/osate/osate2/blob/master/emv2/org.osate.aadl2.errormodel.faulttree.generation/src/org/osate/aadl2/errormodel/faulttree/generation/FTAGenerator.java#L347

If the root event is of the INTERMEDIATE type, the algorithm cannot proceed to the next rootevent check.getSubEventLogic() == LogicOperation.AND. This leads to the gates being processed incorrectly.

I ran some tests and made sure that the fix solves the problem.

[sprocter]

Hi, thanks for reporting this! If you have a fix identified and tested, would you be able to submit that as a pull request for review?

[MaksimPerepelitsa]

Yes, of course! I'll try to do it this weekend.