From 730785ea5f3e10a891298ae26455f0b0ffa8a756 Mon Sep 17 00:00:00 2001 From: Joachim Klein Date: Fri, 21 Jul 2017 16:43:23 +0000 Subject: [PATCH] explicit.MDPSparse: simplify code for getTransitionsIterator Use AbstractMap.SimpleImmutableEntry and remove methods that have default implementations since JDK8. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12143 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/explicit/MDPSparse.java | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/prism/src/explicit/MDPSparse.java b/prism/src/explicit/MDPSparse.java index cc94d132..2cea8df3 100644 --- a/prism/src/explicit/MDPSparse.java +++ b/prism/src/explicit/MDPSparse.java @@ -31,6 +31,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.util.AbstractMap; import java.util.ArrayList; import java.util.BitSet; import java.util.Iterator; @@ -600,35 +601,7 @@ public class MDPSparse extends MDPExplicit assert (col < end); final int i = col; col++; - return new Entry() - { - int key = cols[i]; - double value = nonZeros[i]; - - @Override - public Integer getKey() - { - return key; - } - - @Override - public Double getValue() - { - return value; - } - - @Override - public Double setValue(Double arg0) - { - throw new UnsupportedOperationException(); - } - }; - } - - @Override - public void remove() - { - throw new UnsupportedOperationException(); + return new AbstractMap.SimpleImmutableEntry<>(cols[i], nonZeros[i]); } }; }