From 3f1474c32c7a0adb9c26721da502ee9c47243c34 Mon Sep 17 00:00:00 2001
From: Sascha Wunderlich <sascha.wunderlich@tu-dresden.de>
Date: Fri, 12 Oct 2018 15:36:58 +0200
Subject: [PATCH] accumulation: fix up rebase

---
 prism/src/automata/finite/EdgeLabel.java           |  2 +-
 prism/src/explicit/AccumulationTransformation.java | 11 -----------
 prism/src/parser/ast/ExpressionAccumulation.java   |  6 ++++++
 prism/src/parser/ast/ExpressionRegular.java        |  8 ++++++++
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/prism/src/automata/finite/EdgeLabel.java b/prism/src/automata/finite/EdgeLabel.java
index 85e825ca..89e586c9 100644
--- a/prism/src/automata/finite/EdgeLabel.java
+++ b/prism/src/automata/finite/EdgeLabel.java
@@ -6,7 +6,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 
-import common.iterable.IterableBitSet;
+import common.IterableBitSet;
 
 public class EdgeLabel<Symbol> {
 	private final List<Symbol> symbols;
diff --git a/prism/src/explicit/AccumulationTransformation.java b/prism/src/explicit/AccumulationTransformation.java
index 143d5701..00db25ae 100644
--- a/prism/src/explicit/AccumulationTransformation.java
+++ b/prism/src/explicit/AccumulationTransformation.java
@@ -152,15 +152,4 @@ public class AccumulationTransformation<M extends Model> implements ModelExpress
 		}
 		return label;
 	}
-
-	@Override
-	public Integer mapToTransformedModel(int state) {
-		return product.mapToTransformedModel(state);
-	}
-
-	@Override
-	public BitSet mapToTransformedModel(BitSet states) {
-		return product.mapToTransformedModel(states);
-	}
-	
 }
diff --git a/prism/src/parser/ast/ExpressionAccumulation.java b/prism/src/parser/ast/ExpressionAccumulation.java
index d7a202da..60bd13a9 100644
--- a/prism/src/parser/ast/ExpressionAccumulation.java
+++ b/prism/src/parser/ast/ExpressionAccumulation.java
@@ -26,6 +26,7 @@
 
 package parser.ast;
 
+import param.BigRational;
 import parser.EvaluateContext;
 import parser.type.TypePathBool;
 import parser.visitor.ASTVisitor;
@@ -111,6 +112,11 @@ public class ExpressionAccumulation extends Expression
 	public Object evaluate(EvaluateContext ec) throws PrismLangException {
 		return null;
 	}
+	
+	@Override
+	public BigRational evaluateExact(EvaluateContext ec) throws PrismLangException {
+		return null;
+	}
 
 	@Override
 	public boolean returnsSingleValue() {
diff --git a/prism/src/parser/ast/ExpressionRegular.java b/prism/src/parser/ast/ExpressionRegular.java
index c2744c8f..5db8a9b4 100644
--- a/prism/src/parser/ast/ExpressionRegular.java
+++ b/prism/src/parser/ast/ExpressionRegular.java
@@ -1,5 +1,6 @@
 package parser.ast;
 
+import param.BigRational;
 import parser.EvaluateContext;
 import parser.visitor.ASTVisitor;
 import prism.PrismLangException;
@@ -193,11 +194,18 @@ public class ExpressionRegular extends Expression {
 		 * Note: assumes that type checking has been done already.
 		 */
         //TODO: What???
+		@Override
 		public Object evaluate(EvaluateContext ec) throws PrismLangException
 		{
 			throw new PrismLangException("Cannot evaluate a temporal operator without a path");
 		}
 
+		@Override
+		public BigRational evaluateExact(EvaluateContext ec) throws PrismLangException
+		{
+			throw new PrismLangException("Cannot evaluate a temporal operator without a path");
+		}
+
 		@Override
 		public boolean returnsSingleValue()
 		{