~cpn-gui/tapaal/cpn-editor

Merge from unfoldExport, we can now unfold an verify TACPN through the verification menu in TAPAAL

added added

removed removed

import javax.swing.SwingWorker.StateValue;

import dk.aau.cs.verification.VerifyTAPN.VerifyTAPNDiscreteVerification;

import pipe.dataLayer.TAPNQuery.TraceOption;

import pipe.gui.RunVerificationBase;

import pipe.gui.widgets.InclusionPlaces;

public class ApproximationWorker {

public VerificationResult<TAPNNetworkTrace> normalWorker(VerificationOptions options, ModelChecker modelChecker,

Tuple<TimedArcPetriNet, NameMapping> transformedModel, ITAPNComposer composer, TAPNQuery clonedQuery,

RunVerificationBase verificationBase, TimedArcPetriNetNetwork model) throws Exception {

Tuple<TimedArcPetriNet, NameMapping> transformedModel, TAPNQuery clonedQuery,

RunVerificationBase verificationBase, TimedArcPetriNetNetwork model, String modelOut, String queryOut, TAPNComposer composer) throws Exception {

// If options is of an instance of VerifyTAPNOptions then save the inclusion places before verify alters them

InclusionPlaces oldInclusionPlaces = null;

}

VerificationResult<TAPNNetworkTrace> value = null;

VerificationResult<TimedArcPetriNetTrace> result = modelChecker.verify(options, transformedModel, clonedQuery);

VerificationResult<TimedArcPetriNetTrace> result;

if(model.isColored()) {

result = modelChecker.verify(options, transformedModel, clonedQuery, modelOut, queryOut);

}else {

result = modelChecker.verify(options, transformedModel, clonedQuery);

}

if (verificationBase.isCancelled()) {

verificationBase.firePropertyChange("state", StateValue.PENDING, StateValue.DONE);

}