From 1b12efbb12223e2827346dcabf070d1ee2bbda0a Mon Sep 17 00:00:00 2001
From: Ben Plummer <bjp1g19@soton.ac.uk>
Date: Tue, 31 Jan 2023 12:14:00 +0000
Subject: [PATCH] Build on javac 11
---
prism/src/prism/Prism.java | 4 ++--
prism/src/simulator/SimulatorEngine.java | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/prism/src/prism/Prism.java b/prism/src/prism/Prism.java
index c2958a926..8b89b0251 100644
--- a/prism/src/prism/Prism.java
+++ b/prism/src/prism/Prism.java
@@ -3261,8 +3261,8 @@ public class Prism extends PrismComponent implements PrismSettingsListener
setEngine(Prism.EXPLICIT);
doBuildModel();
- if (strategy instanceof RRStrategy rr) {
- rr.setModel((RBMSimple) currentModelExpl);
+ if (strategy instanceof RRStrategy) {
+ ((RRStrategy) strategy).setModel((RBMSimple) currentModelExpl);
}
setEngine(Prism.HYBRID);
diff --git a/prism/src/simulator/SimulatorEngine.java b/prism/src/simulator/SimulatorEngine.java
index 88d001959..578de17fe 100644
--- a/prism/src/simulator/SimulatorEngine.java
+++ b/prism/src/simulator/SimulatorEngine.java
@@ -410,8 +410,8 @@ public class SimulatorEngine extends PrismComponent
case RBM:
case RBG:
Pair<Integer, Integer> trans;
- if (strategy instanceof ResourceStrategy rStrat)
- trans = rStrat.getAutomaticTransition();
+ if (strategy instanceof ResourceStrategy)
+ trans = ((ResourceStrategy) strategy).getAutomaticTransition();
else
trans = ((RStrategy) strategy).getNextTransition();
executeTransition(trans.getKey(), trans.getValue(), -1);
@@ -920,9 +920,9 @@ public class SimulatorEngine extends PrismComponent
double resourceLoss = rStrat.getPrevTransitionResource();
path.addStep(index, action, actionString, p, currentState, currentObs, resourceLoss, resourceGain, modelGen);
}
- else if (strategy instanceof RRStrategy rrStrat) {
- double el = rrStrat.getEnergyLoss();
- double eg = rrStrat.getEnergyGain();
+ else if (strategy instanceof RRStrategy) {
+ double el = ((RRStrategy) strategy).getEnergyLoss();
+ double eg = ((RRStrategy) strategy).getEnergyGain();
path.addStep(index, action, actionString, p, currentState, currentObs, el, eg, modelGen);
}
else {
--
GitLab