Bugfix: Import allowed with transition rewards only.

prism-tests/functionality/import/dice.pm.importexport.auto

@@ -2,6 +2,10 @@
 -importmodel dice.all -exportmodel dice.all -h
 -importmodel dice.all -exportmodel dice.all -s
 
+# Partial
+-importmodel dice.tra,lab,srew -exportmodel dice.tra,lab,srew
+-importmodel dice.tra,sta,trew -exportmodel dice.tra,sta,trew
+
 # Import model info - exact
 -importmodel dice.all -exportmodel dice.exact.all -exact
 -importmodel dice.exact.all -exportmodel dice.exact.all -exact

prism/src/io/PrismExplicitImporter.java

@@ -108,7 +108,7 @@ public class PrismExplicitImporter implements ExplicitModelImporter
 
 	// File(s) to read in rewards from
 	private List<PrismExplicitImporter.RewardFile> stateRewardsReaders = new ArrayList<>();
-	private List<PrismExplicitImporter.RewardFile> transRewardsRewaders = new ArrayList<>();
+	private List<PrismExplicitImporter.RewardFile> transRewardsReaders = new ArrayList<>();
 
 	// Regex for comments
 	protected static final Pattern COMMENT_PATTERN = Pattern.compile("#.*");
@@ -137,9 +137,9 @@ public PrismExplicitImporter(File statesFile, File transFile, File labelsFile, L
 		for (File file : this.stateRewardsFiles) {
 			this.stateRewardsReaders.add(new PrismExplicitImporter.RewardFile(file));
 		}
-		this.transRewardsRewaders = new ArrayList<>(this.transRewardsFiles.size());
+		this.transRewardsReaders = new ArrayList<>(this.transRewardsFiles.size());
 		for (File file : this.transRewardsFiles) {
-			this.transRewardsRewaders.add(new PrismExplicitImporter.RewardFile(file));
+			this.transRewardsReaders.add(new PrismExplicitImporter.RewardFile(file));
 		}
 	}
 
@@ -902,7 +902,8 @@ private void buildRewardInfo() throws PrismException
 			@Override
 			public List<String> getRewardStructNames()
 			{
-				return Reducible.extend(stateRewardsReaders).map(f -> f.getName().orElse("")).collect(new ArrayList<>(stateRewardsReaders.size()));
+				List<PrismExplicitImporter.RewardFile> rewardsReaders = stateRewardsReaders.size() >= transRewardsFiles.size() ? stateRewardsReaders : transRewardsReaders;
+				return Reducible.extend(rewardsReaders).map(f -> f.getName().orElse("")).collect(new ArrayList<>(rewardsReaders.size()));
 			}
 
 			@Override
@@ -931,17 +932,17 @@ public <Value> void extractStateRewards(int rewardIndex, BiConsumer<Integer, Val
 	@Override
 	public <Value> void extractMCTransitionRewards(int rewardIndex, IOUtils.TransitionRewardConsumer<Value> storeReward, Evaluator<Value> eval) throws PrismException
 	{
-		if (rewardIndex < transRewardsRewaders.size()) {
-			RewardFile file = transRewardsRewaders.get(rewardIndex);
+		if (rewardIndex < transRewardsReaders.size()) {
+			RewardFile file = transRewardsReaders.get(rewardIndex);
 			file.extractMCTransitionRewards(storeReward, eval, numStates);
 		}
 	}
 
 	@Override
 	public <Value> void extractMDPTransitionRewards(int rewardIndex, IOUtils.TransitionStateRewardConsumer<Value> storeReward, Evaluator<Value> eval) throws PrismException
 	{
-		if (rewardIndex < transRewardsRewaders.size()) {
-			RewardFile file = transRewardsRewaders.get(rewardIndex);
+		if (rewardIndex < transRewardsReaders.size()) {
+			RewardFile file = transRewardsReaders.get(rewardIndex);
 			file.extractMDPTransitionRewards(storeReward, eval, numStates);
 		}
 	}