Merge lp:~boegholm/juppaal/SARTS-sync into lp:juppaal

[Thomas Bøgholm]

Sync with SARTS-juppaal
 - replaced:
 return automaton.getName().getName() + id;
 - with
 return "id" + String.valueOf(id);

Which is correct?

Unmerged revisions

5. By Thomas Bøgholm (<email address hidden>) on 2012-12-06

synced with SARTS-juppaal

=== modified file 'src/uppaal/Automaton.java'
--- src/uppaal/Automaton.java	2012-12-05 15:16:00 +0000
+++ src/uppaal/Automaton.java	2012-12-06 12:13:28 +0000
@@ -89,7 +89,8 @@
 			boolean dbg_matchresult = matcher.find();
 			assert dbg_matchresult;
 			String s = matcher.group();
-			init = id_locationMap.get(this.getName().getName() + s);
+			init = id_locationMap.get("id" + s);
+			//init = id_locationMap.get(this.getName().getName() + s);
 		}
 	}
 	
@@ -157,6 +158,10 @@
 	public ArrayList<Location> getLocations() {
 		return locations;
 	}
+	
+//	public void removeLocation(Location loc) {
+//		this.locations.remove(loc);
+//	}
 
 	public Location getInit() {
 		if(this.init== null){
@@ -179,11 +184,16 @@
 		return transitions;
 	}
 
+//	public void removeTransition(Transition removeTrans) {
+//		this.transitions.remove(removeTrans);
+//	}
+	
 	public void addLocation(Location location) {
 		assert !getLocations().contains(location) : "Template already contains this location";
 		assert location.getAutomaton() == null || this.equals(location.getAutomaton()) : "Cannot add from other automata yet";
 		if(location.getAutomaton() == null)
 			location.setAutomaton(this);
+		this.id_locationMap.put(location.getUniqueIdString(), location);
 		this.locations.add(location);
 	}
 

=== modified file 'src/uppaal/Location.java'
--- src/uppaal/Location.java	2012-12-05 15:16:00 +0000
+++ src/uppaal/Location.java	2012-12-06 12:13:28 +0000
@@ -153,7 +153,8 @@
 	}
 
 	public String getUniqueIdString(){
-		return automaton.getName().getName()+id;
+		return "id" + String.valueOf(id);
+		//return automaton.getName().getName() + id;
 	}
 
 	public Invariant getInvariant() {

=== modified file 'src/uppaal/SystemDeclaration.java'
--- src/uppaal/SystemDeclaration.java	2012-08-09 13:03:06 +0000
+++ src/uppaal/SystemDeclaration.java	2012-12-06 12:13:28 +0000
@@ -36,6 +36,9 @@
 	public List<String> getDeclarations() {
 		return this.declarations;
 	}
+	public void addSystemDeclaration(String string) {
+		this.addDeclaration(string);
+	}
 	@Override
 	public String getXMLElementName() {
 		return "system";
@@ -52,9 +55,9 @@
 		for(String decl : declarations)
 			sb.append(decl+"\n");
 		if(systemInstances.size()>0){
-			sb.append("system ");
+			sb.append("system \n\t");
 			for(int index=0;index<systemInstances.size();index++){
-				sb.append(systemInstances.get(index) + ((index+1)<systemInstances.size()?",":";"));
+				sb.append(systemInstances.get(index) + ((index+1)<systemInstances.size()?",\n\t":";"));
 			}
 		}
 		Element result = super.generateXMLElement();

=== modified file 'src/uppaal/Transition.java'
--- src/uppaal/Transition.java	2012-12-05 15:16:00 +0000
+++ src/uppaal/Transition.java	2012-12-06 12:13:28 +0000
@@ -111,13 +111,15 @@
 		boolean dbg_matchresult = matcher.find();
 		assert dbg_matchresult;
 		
-		source = automaton.id_locationMap.get(automaton.getName().getName() + matcher.group(1));
+		//source = automaton.id_locationMap.get(automaton.getName().getName() + matcher.group(1));
+		source = automaton.id_locationMap.get("id" + matcher.group(1));
 		String targetString = transitionElement.getChild("target").getAttributeValue("ref");
 		matcher = locationIdRegExPattern.matcher(targetString);
 		dbg_matchresult = matcher.find();
 		assert dbg_matchresult;
 		
-		destination = automaton.id_locationMap.get(automaton.getName().getName() + matcher.group(1));
+		//destination = automaton.id_locationMap.get(automaton.getName().getName() + matcher.group(1));
+		destination = automaton.id_locationMap.get("id" + matcher.group(1));
 
 		@SuppressWarnings("unchecked")
 		List<Element> children = transitionElement.getChildren();
@@ -162,8 +164,8 @@
 		return nails;
 	}
 
-	public void setNails(ArrayList<Nail> nails) {
-		this.nails = nails;
+	public void setNails(List<Nail> list) {
+		this.nails = list;
 	}
 	
 	public void addNail(Nail nail){

=== modified file 'src/uppaal/UPPAALPrettyfy.java'
--- src/uppaal/UPPAALPrettyfy.java	2012-08-09 13:03:06 +0000
+++ src/uppaal/UPPAALPrettyfy.java	2012-12-06 12:13:28 +0000
@@ -28,6 +28,34 @@
 		List<Element> templates = rootElement.getChildren("template");
 				
 		for(Element template : templates){
+			List<Element> transitions = template.getChildren("transition");
+			for(Element transition : transitions) {
+				List<Element> labels = transition.getChildren("label");
+				for(Element label : labels) {
+					label.removeAttribute("x");
+					label.removeAttribute("y");
+				}
+				transition.removeChildren("nail");
+				
+			}
+			List<Element> locations = template.getChildren("location");		
+			for(Element location : locations) {
+				location.removeAttribute("x");
+				location.removeAttribute("y");
+				
+				List<Element> labels = location.getChildren("label");
+				for(Element label : labels) {
+					label.removeAttribute("x");
+					label.removeAttribute("y");
+				}
+				List<Element> names = location.getChildren("name");
+				for(Element name : names) {
+					name.removeAttribute("x");
+					name.removeAttribute("y");
+				}
+			}
+
+			
 			Graph graph = new Graph(template.getChildText("name"));
 			
 			graph = loadGraph( template, graph);
@@ -55,10 +83,10 @@
 			        }
 			}
 		}
-		
 		return uppaalXml;
-		
 	}
+
+	
 	private static File writeGraph(Element template, Graph graph) throws FileNotFoundException, IOException, InterruptedException {
 		File folder = new File("/tmp/juppaal/");
 		folder.mkdirs();