Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 4 additions & 29 deletions src/fdtmc/FDTMC.java
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ private Map<State, State> copyForInlining(FDTMC destination) {
* @param fdtmc
* @return
*/
private Map<State, State> inlineStates(FDTMC fdtmc) {
Map<State, State> inlineStates(FDTMC fdtmc) {
Map<State, State> statesOldToNew = new HashMap<State, State>();
for (State state: fdtmc.getStates()) {
State newState = this.createState();
Expand All @@ -344,7 +344,7 @@ private Map<State, State> inlineStates(FDTMC fdtmc) {
* @param fdtmc
* @param statesOldToNew
*/
private void inlineTransitions(FDTMC fdtmc, Map<State, State> statesOldToNew) {
void inlineTransitions(FDTMC fdtmc, Map<State, State> statesOldToNew) {
Set<Transition> interfaceTransitions = fdtmc.getInterfaceTransitions();
for (Map.Entry<State, List<Transition>> entry : fdtmc.getTransitions().entrySet()) {
State newSource = statesOldToNew.get(entry.getKey());
Expand Down Expand Up @@ -391,34 +391,9 @@ private void inlineInterface(Interface iface, FDTMC fragment, Map<State, State>
}

private void inlineInterfaceWithVariability(Interface iface, FDTMC fragment, Map<State, State> statesMapping) {
Map<State, State> fragmentStatesMapping = this.inlineStates(fragment);
this.inlineTransitions(fragment, fragmentStatesMapping);
InlineInterfaceWithVariability inlineInterfaceWithVariability = new InlineInterfaceWithVariability(this, iface, fragment, statesMapping);
inlineInterfaceWithVariability.compute();

State initialInlined = iface.getInitial();
State initialFragment = fragment.getInitialState();
State successInlined = iface.getSuccess();
State successFragment = fragment.getSuccessState();
State errorInlined = iface.getError();
State errorFragment = fragment.getErrorState();

this.createTransition(statesMapping.get(initialInlined),
fragmentStatesMapping.get(initialFragment),
"",
iface.getAbstractedId());
this.createTransition(statesMapping.get(initialInlined),
statesMapping.get(successInlined),
"",
"1 - " + iface.getAbstractedId());
this.createTransition(fragmentStatesMapping.get(successFragment),
statesMapping.get(successInlined),
"",
"1");
if (errorFragment != null) {
this.createTransition(fragmentStatesMapping.get(errorFragment),
statesMapping.get(errorInlined),
"",
"1");
}
}

private Set<Transition> getInterfaceTransitions() {
Expand Down
57 changes: 57 additions & 0 deletions src/fdtmc/InlineInterfaceWithVariability.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package fdtmc;

import java.util.Map;

public class InlineInterfaceWithVariability {
private final FDTMC _fdtmc;
private Interface iface;
private FDTMC fragment;
private Map<State, State> statesMapping;
private Map<State, State> fragmentStatesMapping;
private State initialInlined;
private State initialFragment;
private State successInlined;
private State successFragment;
private State errorInlined ;
private State errorFragment;

public InlineInterfaceWithVariability(FDTMC source, Interface ifaceArg, FDTMC fragmentArg,
Map<State, State> statesMappingArg) {
_fdtmc = source;
iface = ifaceArg;
fragment = fragmentArg;
statesMapping = statesMappingArg;

}

void compute() {
fragmentStatesMapping = _fdtmc.inlineStates(fragment);
_fdtmc.inlineTransitions(fragment, fragmentStatesMapping);

initialInlined = iface.getInitial();
initialFragment = fragment.getInitialState();
successInlined = iface.getSuccess();
successFragment = fragment.getSuccessState();
errorInlined = iface.getError();
errorFragment = fragment.getErrorState();

_fdtmc.createTransition(statesMapping.get(initialInlined),
fragmentStatesMapping.get(initialFragment),
"",
iface.getAbstractedId());
_fdtmc.createTransition(statesMapping.get(initialInlined),
statesMapping.get(successInlined),
"",
"1 - " + iface.getAbstractedId());
_fdtmc.createTransition(fragmentStatesMapping.get(successFragment),
statesMapping.get(successInlined),
"",
"1");
if (errorFragment != null) {
fdtmc.createTransition(fragmentStatesMapping.get(errorFragment),
statesMapping.get(errorInlined),
"",
"1");
}
}
}