From 7385c31f584ef59d5451ce1f3335746cb730ec71 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Mon, 17 Mar 2008 20:46:31 +0000 Subject: [PATCH] Slightly better model reward info output. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@681 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/prism/NondetModel.java | 14 ++++++++++---- prism/src/prism/ProbModel.java | 14 ++++++++++---- prism/src/prism/StochModel.java | 14 ++++++++++---- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/prism/src/prism/NondetModel.java b/prism/src/prism/NondetModel.java index f02b6185..c60687d5 100644 --- a/prism/src/prism/NondetModel.java +++ b/prism/src/prism/NondetModel.java @@ -329,18 +329,24 @@ public class NondetModel implements Model for (i = 0; i < numRewardStructs; i++) { if (stateRewards[i] != null && !stateRewards[i].equals(JDD.ZERO)) { - log.print("State rewards ("+i+"): "); + log.print("State rewards ("+(i+1)+(("".equals(rewardStructNames[i]))?"":(":\""+rewardStructNames[i]+"\""))+"): "); log.print(JDD.GetNumNodes(stateRewards[i]) + " nodes ("); log.print(JDD.GetNumTerminals(stateRewards[i]) + " terminal), "); log.print(JDD.GetNumMintermsString(stateRewards[i], getNumDDRowVars()) + " minterms\n"); - if (extra) log.print("State rewards ("+i+") terminals : " + JDD.GetTerminalsAndNumbersString(stateRewards[i], getNumDDRowVars())+"\n"); + if (extra) { + log.print("State rewards terminals ("+(i+1)+(("".equals(rewardStructNames[i]))?"":(":\""+rewardStructNames[i]+"\""))+"): "); + log.print(JDD.GetTerminalsAndNumbersString(stateRewards[i], getNumDDRowVars())+"\n"); + } } if (transRewards[i] != null && !transRewards[i].equals(JDD.ZERO)) { - log.print("Transition rewards ("+i+"): "); + log.print("Transition rewards ("+(i+1)+(("".equals(rewardStructNames[i]))?"":(":\""+rewardStructNames[i]+"\""))+"): "); log.print(JDD.GetNumNodes(transRewards[i]) + " nodes ("); log.print(JDD.GetNumTerminals(transRewards[i]) + " terminal), "); log.print(JDD.GetNumMintermsString(transRewards[i], getNumDDVarsInTrans()) + " minterms\n"); - if (extra) log.print("Transition rewards ("+i+") terminals : " + JDD.GetTerminalsAndNumbersString(transRewards[i], getNumDDVarsInTrans())+"\n"); + if (extra) { + log.print("Transition rewards terminals ("+(i+1)+(("".equals(rewardStructNames[i]))?"":(":\""+rewardStructNames[i]+"\""))+"): "); + log.print(JDD.GetTerminalsAndNumbersString(transRewards[i], getNumDDVarsInTrans())+"\n"); + } } } } diff --git a/prism/src/prism/ProbModel.java b/prism/src/prism/ProbModel.java index e8abc273..c4049bae 100644 --- a/prism/src/prism/ProbModel.java +++ b/prism/src/prism/ProbModel.java @@ -279,18 +279,24 @@ public class ProbModel implements Model } for (i = 0; i < numRewardStructs; i++) { if (stateRewards[i] != null && !stateRewards[i].equals(JDD.ZERO)) { - log.print("State rewards ("+i+"): "); + log.print("State rewards ("+(i+1)+(("".equals(rewardStructNames[i]))?"":(":\""+rewardStructNames[i]+"\""))+"): "); log.print(JDD.GetNumNodes(stateRewards[i]) + " nodes ("); log.print(JDD.GetNumTerminals(stateRewards[i]) + " terminal), "); log.print(JDD.GetNumMintermsString(stateRewards[i], getNumDDRowVars()) + " minterms\n"); - if (extra) log.print("State rewards ("+i+") terminals : " + JDD.GetTerminalsAndNumbersString(stateRewards[i], getNumDDRowVars())+"\n"); + if (extra) { + log.print("State rewards terminals ("+(i+1)+(("".equals(rewardStructNames[i]))?"":(":\""+rewardStructNames[i]+"\""))+"): "); + log.print(JDD.GetTerminalsAndNumbersString(stateRewards[i], getNumDDRowVars())+"\n"); + } } if (transRewards[i] != null && !transRewards[i].equals(JDD.ZERO)) { - log.print("Transition rewards ("+i+"): "); + log.print("Transition rewards ("+(i+1)+(("".equals(rewardStructNames[i]))?"":(":\""+rewardStructNames[i]+"\""))+"): "); log.print(JDD.GetNumNodes(transRewards[i]) + " nodes ("); log.print(JDD.GetNumTerminals(transRewards[i]) + " terminal), "); log.print(JDD.GetNumMintermsString(transRewards[i], getNumDDVarsInTrans()) + " minterms\n"); - if (extra) log.print("Transition rewards ("+i+") terminals : " + JDD.GetTerminalsAndNumbersString(transRewards[i], getNumDDVarsInTrans())+"\n"); + if (extra) { + log.print("Transition rewards terminals ("+(i+1)+(("".equals(rewardStructNames[i]))?"":(":\""+rewardStructNames[i]+"\""))+"): "); + log.print(JDD.GetTerminalsAndNumbersString(transRewards[i], getNumDDVarsInTrans())+"\n"); + } } } } diff --git a/prism/src/prism/StochModel.java b/prism/src/prism/StochModel.java index cf707344..4c70716e 100644 --- a/prism/src/prism/StochModel.java +++ b/prism/src/prism/StochModel.java @@ -279,18 +279,24 @@ public class StochModel implements Model for (i = 0; i < numRewardStructs; i++) { if (stateRewards[i] != null && !stateRewards[i].equals(JDD.ZERO)) { - log.print("State rewards ("+i+"): "); + log.print("State rewards ("+(i+1)+(("".equals(rewardStructNames[i]))?"":(":\""+rewardStructNames[i]+"\""))+"): "); log.print(JDD.GetNumNodes(stateRewards[i]) + " nodes ("); log.print(JDD.GetNumTerminals(stateRewards[i]) + " terminal), "); log.print(JDD.GetNumMintermsString(stateRewards[i], getNumDDRowVars()) + " minterms\n"); - if (extra) log.print("State rewards ("+i+") terminals : " + JDD.GetTerminalsAndNumbersString(stateRewards[i], getNumDDRowVars())+"\n"); + if (extra) { + log.print("State rewards terminals ("+(i+1)+(("".equals(rewardStructNames[i]))?"":(":\""+rewardStructNames[i]+"\""))+"): "); + log.print(JDD.GetTerminalsAndNumbersString(stateRewards[i], getNumDDRowVars())+"\n"); + } } if (transRewards[i] != null && !transRewards[i].equals(JDD.ZERO)) { - log.print("Transition rewards ("+i+"): "); + log.print("Transition rewards ("+(i+1)+(("".equals(rewardStructNames[i]))?"":(":\""+rewardStructNames[i]+"\""))+"): "); log.print(JDD.GetNumNodes(transRewards[i]) + " nodes ("); log.print(JDD.GetNumTerminals(transRewards[i]) + " terminal), "); log.print(JDD.GetNumMintermsString(transRewards[i], getNumDDVarsInTrans()) + " minterms\n"); - if (extra) log.print("Transition rewards ("+i+") terminals : " + JDD.GetTerminalsAndNumbersString(transRewards[i], getNumDDVarsInTrans())+"\n"); + if (extra) { + log.print("Transition rewards terminals ("+(i+1)+(("".equals(rewardStructNames[i]))?"":(":\""+rewardStructNames[i]+"\""))+"): "); + log.print(JDD.GetTerminalsAndNumbersString(transRewards[i], getNumDDVarsInTrans())+"\n"); + } } } }