From d1bca01e7de3d238020e3c973341082e16c2a5f4 Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Mon, 11 Dec 2006 22:02:31 +0000
Subject: [PATCH] Use reward structure name for experiment result name, i.e.
 Y-axis, where appropriate.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@194 bbc10eb1-c90d-0410-af57-cb519fbb1720
---
 prism/src/parser/PCTLReward.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/prism/src/parser/PCTLReward.java b/prism/src/parser/PCTLReward.java
index d9d221e1..92401da2 100644
--- a/prism/src/parser/PCTLReward.java
+++ b/prism/src/parser/PCTLReward.java
@@ -108,8 +108,16 @@ public class PCTLReward extends PCTLFormulaUnary
 	
 	public String getResultName()
 	{
-		// default is just "Result", will be overridden where necessary
-		return (reward == null) ? "Expected reward" : "Result";
+		// For R=? properties, use name of reward structure where applicable
+		if (reward == null) {
+			if (rewardStructIndex instanceof String) return "Expected "+rewardStructIndex;
+			// or just call it "Expected reward"
+			else return "Expected reward";
+		}
+		// For R>r etc., just use "Result"
+		else {
+			return "Result";
+		}
 	}
 
 	// check all labels (make sure the referred labels exist)