From 3614b2d56299b078d2ac621bcde5f8d609b1ea3e Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Tue, 11 Aug 2009 20:35:50 +0000
Subject: [PATCH] Use of map function in PRISM A-R.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1423 bbc10eb1-c90d-0410-af57-cb519fbb1720
---
 .../src/explicit/PrismSTPGAbstractRefine.java | 29 ++-----------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/prism/src/explicit/PrismSTPGAbstractRefine.java b/prism/src/explicit/PrismSTPGAbstractRefine.java
index 234fd46d..199c194d 100644
--- a/prism/src/explicit/PrismSTPGAbstractRefine.java
+++ b/prism/src/explicit/PrismSTPGAbstractRefine.java
@@ -181,18 +181,7 @@ public class PrismSTPGAbstractRefine extends STPGAbstractRefine
 	 */
 	protected Distribution buildAbstractDistribution(int c, DTMC dtmc)
 	{
-		Distribution distrNew;
-		int k;
-		double prob;
-
-		distrNew = new Distribution();
-		for (Map.Entry<Integer, Double> e : dtmc.trans.get(c)) {
-			k = (Integer) e.getKey();
-			prob = (Double) e.getValue();
-			distrNew.add(concreteToAbstract[k], prob);
-		}
-
-		return distrNew;
+		return dtmc.trans.get(c).map(concreteToAbstract);
 	}
 
 	/**
@@ -200,22 +189,10 @@ public class PrismSTPGAbstractRefine extends STPGAbstractRefine
 	 */
 	protected DistributionSet buildAbstractDistributionSet(int c, MDP mdp, STPG stpg)
 	{
-		Distribution distrNew;
-		DistributionSet set;
-		int k;
-		double prob;
-
-		set = ((STPG) stpg).newDistributionSet(null);
+		DistributionSet set = ((STPG) stpg).newDistributionSet(null);
 		for (Distribution distr : mdp.steps.get(c)) {
-			distrNew = new Distribution();
-			for (Map.Entry<Integer, Double> e : distr) {
-				k = (Integer) e.getKey();
-				prob = (Double) e.getValue();
-				distrNew.add(concreteToAbstract[k], prob);
-			}
-			set.add(distrNew);
+			set.add(distr.map(concreteToAbstract));
 		}
-
 		return set;
 	}