Skip to content

Organization of strings #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stebezs wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Organization of strings #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed89dc2
Organization of strings
stebezs Oct 4, 2017
31cbe4c
Bad smell
stebezs Oct 6, 2017
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
52 changes: 38 additions & 14 deletions src/fdtmc/FDTMC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import java.util.Map;
import java.util.Set;

import com.sun.org.apache.xml.internal.dtm.ref.IncrementalSAXSource;

public class FDTMC {

public static final String INITIAL_LABEL = "initial";
Expand Down Expand Up @@ -53,21 +55,34 @@ public int getVariableIndex() {
}

public State createState() {
State temp = new State();
temp.setVariableName(variableName);
temp.setIndex(index);
states.add(temp);
transitionSystem.put(temp, null);
State state = new State();
state.setVariableName(variableName);
state.setIndex(index);
addState(state);

return state;
}

private void addState (State state) {
states.add(state);
transitionSystem.put(state, null);

if (index == 0)
initialState = temp;
index++;
return temp;
setInitialState(state);

increasingIndex();

}

private int increasingIndex() {
return index++;
}


public State createState(String label) {
State temp = createState();
temp.setLabel(label);
return temp;
State state = createState();
state.setLabel(label);
return state;
}

public State createInitialState() {
Expand Down Expand Up @@ -195,8 +210,19 @@ public Transition getTransitionByActionName(String action) {
}


public String toState(State temp, Transition t) {
String resultado;

resultado = temp.getVariableName() + "=" + temp.getIndex() + ((temp.getLabel() != null) ? "(" + temp.getLabel() + ")" : "") +
" --- " + t.getActionName() + " / " + t.getProbability() +
" ---> " + t.getTarget().getVariableName() + "=" + t.getTarget().getIndex() + ((t.getTarget().getLabel() != null) ? "(" + t.getTarget().getLabel() + ")" : "") + "\n";
return resultado;

}

@Override
public String toString() {
String resultado = new String();
String msg = new String();

Set<State> tmpStates = this.transitionSystem.keySet();
Expand All @@ -208,9 +234,7 @@ public String toString() {
Iterator <Transition> itTransitions = transitionList.iterator();
while (itTransitions.hasNext()) {
Transition t = itTransitions.next();
msg += temp.getVariableName() + "=" + temp.getIndex() + ((temp.getLabel() != null) ? "(" + temp.getLabel() + ")" : "") +
" --- " + t.getActionName() + " / " + t.getProbability() +
" ---> " + t.getTarget().getVariableName() + "=" + t.getTarget().getIndex() + ((t.getTarget().getLabel() != null) ? "(" + t.getTarget().getLabel() + ")" : "") + "\n";
msg += resultado;
}
}
}
Expand Down