Merge lp:~tapaal-contributor/tapaal/weight-values-fix-1770637 into lp:tapaal

[Jiri Srba]

Fixes bug 1770637 where weight names were used instead of constants
in export to PNML and in the composer.

[Jiri Srba (srba)]

Tested and works now.

review: Approve

=== modified file 'src/dk/aau/cs/io/PNMLWriter.java'
--- src/dk/aau/cs/io/PNMLWriter.java	2014-06-08 12:58:26 +0000
+++ src/dk/aau/cs/io/PNMLWriter.java	2018-05-13 19:57:55 +0000
@@ -236,7 +236,7 @@
 			arcElement.appendChild(inscription);
 			Element text = document.createElement("text");
 			inscription.appendChild(text);
-			text.setTextContent(((TimedOutputArcComponent)arc).getWeight().nameForSaving(true)+"");
+			text.setTextContent(((TimedOutputArcComponent)arc).getWeight().nameForSaving(false)+"");
 		} 
 		
 		if(arc instanceof TimedInhibitorArcComponent){
 
=== modified file 'src/dk/aau/cs/model/tapn/TimedInputArc.java'
--- src/dk/aau/cs/model/tapn/TimedInputArc.java	2014-08-26 15:02:32 +0000
+++ src/dk/aau/cs/model/tapn/TimedInputArc.java	2018-05-13 19:57:55 +0000
@@ -36,6 +36,10 @@
 		return weight;
 	}
 	
+        public Weight getWeightValue(){
+		return new IntWeight(weight.value());
+	}
+        
 	public void setWeight(Weight weight){
 		this.weight = weight;
 	}
 
=== modified file 'src/dk/aau/cs/model/tapn/TimedOutputArc.java'
--- src/dk/aau/cs/model/tapn/TimedOutputArc.java	2012-08-14 20:39:56 +0000
+++ src/dk/aau/cs/model/tapn/TimedOutputArc.java	2018-05-13 19:57:55 +0000
@@ -23,6 +23,10 @@
 	public Weight getWeight(){
 		return weight;
 	}
+        
+        public Weight getWeightValue(){
+                return new IntWeight(weight.value());
+	}
 	
 	public void setWeight(Weight weight){
 		this.weight = weight;
 
=== modified file 'src/dk/aau/cs/model/tapn/TransportArc.java'
--- src/dk/aau/cs/model/tapn/TransportArc.java	2014-04-08 12:57:51 +0000
+++ src/dk/aau/cs/model/tapn/TransportArc.java	2018-05-13 19:57:55 +0000
@@ -40,6 +40,10 @@
 	public Weight getWeight(){
 		return weight;
 	}
+        
+        public Weight getWeightValue(){
+                return new IntWeight(weight.value());
+	}
 	
 	public void setWeight(Weight weight){
 		this.weight = weight;
 
=== modified file 'src/dk/aau/cs/verification/TAPNComposer.java'
--- src/dk/aau/cs/verification/TAPNComposer.java	2018-05-05 07:19:39 +0000
+++ src/dk/aau/cs/verification/TAPNComposer.java	2018-05-13 19:57:55 +0000
@@ -377,7 +377,7 @@
 				} else {
 					newInterval.setUpperBound(new IntBound(newInterval.upperBound().value()));
 				}
-				TimedInputArc addedArc = new TimedInputArc(source, target, newInterval, arc.getWeight());
+				TimedInputArc addedArc = new TimedInputArc(source, target, newInterval, arc.getWeightValue());
 				constructedModel.add(addedArc);
 				
 				// Gui work
@@ -435,7 +435,7 @@
 				String destinationTemplate = arc.destination().isShared() ? "" : tapn.name();
 				TimedPlace target = constructedModel.getPlaceByName(mapping.map(destinationTemplate, arc.destination().name()));
 
-				TimedOutputArc addedArc = new TimedOutputArc(source, target, arc.getWeight());
+				TimedOutputArc addedArc = new TimedOutputArc(source, target, arc.getWeightValue());
 				constructedModel.add(addedArc);
 				
 				// Gui work
@@ -504,7 +504,7 @@
 				} else {
 					newInterval.setUpperBound(new IntBound(newInterval.upperBound().value()));
 				}
-				TransportArc addedArc = new TransportArc(source, transition, destination, newInterval, arc.getWeight());
+				TransportArc addedArc = new TransportArc(source, transition, destination, newInterval, arc.getWeightValue());
 				constructedModel.add(addedArc);
 				
 				//Create input transport arc
@@ -628,7 +628,7 @@
 				} else {
 					newInterval.setUpperBound(new IntBound(newInterval.upperBound().value()));
 				}
-				TimedInhibitorArc addedArc = new TimedInhibitorArc(source, target, newInterval, arc.getWeight());
+				TimedInhibitorArc addedArc = new TimedInhibitorArc(source, target, newInterval, arc.getWeightValue());
 				constructedModel.add(addedArc);
 				
 				// Gui work