Refatoração Trabalho 1

src/fdtmc/FDTMC.java

@@ -208,9 +208,13 @@ 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() + ")" : "") +
+					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";
+							" ---> " + t.getTarget().getVariableName() + "=" 
+							+ t.getTarget().getIndex() 
+							+ ((t.getTarget().getLabel() != null) ? "(" 
+							+ t.getTarget().getLabel() + ")" : "") + "\n";
 				}
 			}
 		}
@@ -231,16 +235,21 @@ public boolean equals(Object obj) {
 	        FDTMC other = (FDTMC) obj;
 	        LinkedList<List<Interface>> thisInterfaces = new LinkedList<List<Interface>>(interfaces.values());
             LinkedList<List<Interface>> otherInterfaces = new LinkedList<List<Interface>>(other.interfaces.values());
-            return states.equals(other.states)
-	                && getInitialState().equals(other.getInitialState())
-	                && getSuccessState().equals(other.getSuccessState())
-	                && getErrorState().equals(other.getErrorState())
-	                && transitionSystem.equals(other.transitionSystem)
-	                && thisInterfaces.equals(otherInterfaces);
+            return compareStateAttributes(other, thisInterfaces, otherInterfaces);
 	    }
 	    return false;
 	}
 
+	private boolean compareStateAttributes(FDTMC other, LinkedList<List<Interface>> thisInterfaces,
+			LinkedList<List<Interface>> otherInterfaces) {
+		return states.equals(other.states)
+		        && getInitialState().equals(other.getInitialState())
+		        && getSuccessState().equals(other.getSuccessState())
+		        && getErrorState().equals(other.getErrorState())
+		        && transitionSystem.equals(other.transitionSystem)
+		        && thisInterfaces.equals(otherInterfaces);
+	}
+
 	@Override
     public int hashCode() {
         return states.hashCode() + transitionSystem.hashCode() + interfaces.hashCode();

src/fdtmc/Inline.java

@@ -0,0 +1,52 @@
+package fdtmc;
+
+public class Inline {
+
+	private Interface iface;
+	private FDTMC fragment;
+
+	private State initialInlined;
+    private State initialFragment;
+    private State successInlined;
+    private State successFragment;
+    private State errorInlined;
+    private State errorFragment;
+
+	public Inline(Interface iface, FDTMC fragment) {
+
+		this.iface = iface;
+		this.fragment = fragment;
+
+		 this.initialInlined = iface.getInitial();
+	     this.initialFragment = fragment.getInitialState();
+	     this.successInlined = iface.getSuccess();
+	     this.successFragment = fragment.getSuccessState();
+	     this.errorInlined = iface.getError();
+	     this.errorFragment = fragment.getErrorState();
+
+	}
+
+	public State getInitialInlined() {
+		return initialInlined;
+	}
+
+	public State getInitialFragment() {
+		return initialFragment;
+	}
+
+	public State getSuccessInlined() {
+		return successInlined;
+	}
+
+	public State getSuccessFragment() {
+		return successFragment;
+	}
+
+	public State getErrorInlined() {
+		return errorInlined;
+	}
+
+	public State getErrorFragment() {
+		return errorFragment;
+	}
+}

src/fdtmc/Interface.java

@@ -53,15 +53,19 @@ public String getAbstractedId() {
     public boolean equals(Object obj) {
         if (obj != null && obj instanceof Interface) {
             Interface other = (Interface) obj;
-            return initial.equals(other.initial)
-                    && success.equals(other.success)
-                    && error.equals(other.error)
-                    && successTransition.equals(other.successTransition)
-                    && errorTransition.equals(other.errorTransition);
+            return compareInterfaceAtributtes(other);
         }
         return false;
     }
 
+	private boolean compareInterfaceAtributtes(Interface other) {
+		return initial.equals(other.initial)
+		        && success.equals(other.success)
+		        && error.equals(other.error)
+		        && successTransition.equals(other.successTransition)
+		        && errorTransition.equals(other.errorTransition);
+	}
+
     @Override
     public int hashCode() {
         return initial.hashCode()

src/fdtmc/State.java

@@ -34,13 +34,14 @@ public String getLabel() {
      * A state is equal to another one if they have equal indices.
      * Labels are only considered when comparing FDTMCs as a whole.
      */
-    @Override
+	@Override
     public boolean equals(Object obj) {
+    		boolean isEqual = false;
         if (obj != null && obj instanceof State) {
             State other = (State) obj;
-            return this.index == other.index;
+            isEqual = this.index == other.index;
         }
-        return false;
+        return isEqual;
     }
 
     @Override

src/paramwrapper/ParamModel.java

@@ -22,16 +22,16 @@
 class ParamModel {
 	private String stateVariable = "s";
 	// TODO Deixar nome do módulo PARAM configurável.
-	private String moduleName = "dummyModule";
+	private final String moduleName = "dummyModule";
 	// TODO Inferir estado inicial a partir da topologia da FDTMC.
 	private int initialState = 0;
 
-	private Set<String> parameters;
-	private Map<String, Set<Integer>> labels;
-	private Map<Integer, Command> commands;
+	private final Set<String> parameters;
+	private final Map<String, Set<Integer>> labels;
+	private final Map<Integer, Command> commands;
 
-	private int stateRangeStart;
-	private int stateRangeEnd;
+	private final int stateRangeStart;
+	private final int stateRangeEnd;
 
 	public ParamModel(FDTMC fdtmc) {
 		if (fdtmc.getVariableName() != null) {
@@ -50,13 +50,13 @@ public ParamModel(FDTMC fdtmc) {
 	private Map<String, Set<Integer>> getLabels(FDTMC fdtmc) {
 		Map<String, Set<Integer>> labeledStates = new TreeMap<String, Set<Integer>>();
 		Collection<State> states = fdtmc.getStates();
-		for (State s : states) {
-			String label = s.getLabel();
+		for (State actualState : states) {
+			String label = actualState.getLabel();
 			if (label != null) {
 				if (!labeledStates.containsKey(label)) {
 					labeledStates.put(label, new TreeSet<Integer>());
 				}
-				labeledStates.get(label).add(s.getIndex());
+				labeledStates.get(label).add(actualState.getIndex());
 			}
 		}
 		return labeledStates;
@@ -88,9 +88,9 @@ private Set<String> getParameters(Collection<Command> commands) {
 		Pattern validIdentifier = Pattern.compile("[A-Za-z_][A-Za-z0-9_]*");
 		for (Command command : commands) {
 			for (String probability : command.getUpdatesProbabilities()) {
-				Matcher m = validIdentifier.matcher(probability);
-				while (m.find()) {
-					tmpParameters.add(m.group());
+				Matcher matcherToFind = validIdentifier.matcher(probability);
+				while (matcherToFind.find()) {
+					tmpParameters.add(matcherToFind.group());
 				}
 			}
 		}
@@ -103,14 +103,7 @@ public String toString() {
 		for (String parameter : parameters) {
 			params += "param double "+parameter+";\n";
 		}
-		String module =
-				"dtmc\n" +
-				"\n" +
-				params +
-				"\n" +
-				"module " + moduleName + "\n" +
-				"	"+stateVariable+ " : ["+stateRangeStart+".."+stateRangeEnd+"] init "+initialState+";" +
-				"\n";
+		String module = moduleString(params);
 		for (Command command : commands.values()) {
 			module += "	"+command.makeString(stateVariable) + "\n";
 		}
@@ -121,17 +114,32 @@ public String toString() {
 
 			Set<Integer> states = entry.getValue();
 			int count = 1;
-			for (Integer state : states) {
-				module += stateVariable+"="+state;
-				if (count < states.size()) {
-					module += " | ";
-				}
-				count++;
-			}
+			module = changeModuleState(module, states, count);
 			module += ";\n";
 		}
 		return module;
 	}
+
+	private String changeModuleState(String module, Set<Integer> states, int count) {
+		for (Integer state : states) {
+			module += stateVariable+"="+state;
+			if (count < states.size()) {
+				module += " | ";
+			}
+			count++;
+		}
+		return module;
+	}
+
+	private String moduleString(String params) {
+		return 	"dtmc\n" +
+				"\n" +
+				params +
+				"\n" +
+				"module " + moduleName + "\n" +
+				"	"+stateVariable+ " : ["+stateRangeStart+".."+stateRangeEnd+"] init "+initialState+";" +
+				"\n";
+	}
 }
 
 class Command {

src/paramwrapper/ParamWrapper.java

@@ -46,38 +46,56 @@ public String getReliability(FDTMC fdtmc) {
 	}
 
 	private String evaluate(String model, String property) {
+		final String stringToBeReplaced = "\\s+";
 		try {
 			File modelFile = File.createTempFile("model", "param");
 			FileWriter modelWriter = new FileWriter(modelFile);
-			modelWriter.write(model);
-			modelWriter.flush();
-			modelWriter.close();
+			writeAndFlushFile(modelFile, modelWriter, model);
 
 			File propertyFile = File.createTempFile("property", "prop");
 			FileWriter propertyWriter = new FileWriter(propertyFile);
-			propertyWriter.write(property);
-			propertyWriter.flush();
-			propertyWriter.close();
+			writeAndFlushFile(propertyFile, propertyWriter, property);
 
 			File resultsFile = File.createTempFile("result", null);
 
 			String formula;
-			if (usePrism && !model.contains("param")) {
-			    formula = invokeModelChecker(modelFile.getAbsolutePath(),
-			                                 propertyFile.getAbsolutePath(),
-			                                 resultsFile.getAbsolutePath());
-			} else {
-			    formula = invokeParametricModelChecker(modelFile.getAbsolutePath(),
-			                                           propertyFile.getAbsolutePath(),
-			                                           resultsFile.getAbsolutePath());
-			}
-			return formula.trim().replaceAll("\\s+", "");
+			formula = invokeTypeModelChecker(model, modelFile, propertyFile, resultsFile);
+			return formula.trim().replaceAll(stringToBeReplaced, "");
 		} catch (IOException e) {
 			LOGGER.log(Level.SEVERE, e.toString(), e);
 		}
 		return "";
 	}
 
+	private String invokeTypeModelChecker(String model, 
+										  File modelFile, 
+										  File propertyFile, 
+										  File resultsFile) throws IOException {
+		String formula;
+		final boolean modelContainParam = model.contains("param");
+		if (usePrism && !modelContainParam) {
+		    formula = invokeModelChecker(modelFile.getAbsolutePath(),
+		                                 propertyFile.getAbsolutePath(),
+		                                 resultsFile.getAbsolutePath());
+		} else {
+		    formula = invokeParametricModelChecker(modelFile.getAbsolutePath(),
+		                                           propertyFile.getAbsolutePath(),
+		                                           resultsFile.getAbsolutePath());
+		}
+		return formula;
+	}
+
+	private void writeAndFlushFile(File file, FileWriter writer, String model) {
+		try {
+			writer.write(model);
+			writer.flush();
+			writer.close();
+		} catch (IOException e) {
+			LOGGER.log(Level.SEVERE, e.toString(), e);
+		}
+
+	}
+
 	private String invokeParametricModelChecker(String modelPath,
 												String propertyPath,
 												String resultsPath) throws IOException {