From d212b33f2b28fc3e77320465e0d25e1b18de4338 Mon Sep 17 00:00:00 2001 From: Joachim Klein Date: Mon, 28 Aug 2017 12:45:47 +0200 Subject: [PATCH] param.ValueComputer: extends PrismComponent Provides access to log and settings. --- prism/src/param/ParamModelChecker.java | 2 +- prism/src/param/ValueComputer.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/prism/src/param/ParamModelChecker.java b/prism/src/param/ParamModelChecker.java index 2f415fbf..7112dd15 100644 --- a/prism/src/param/ParamModelChecker.java +++ b/prism/src/param/ParamModelChecker.java @@ -220,7 +220,7 @@ final public class ParamModelChecker extends PrismComponent constraintChecker = new ConstraintChecker(numRandomPoints); regionFactory = new BoxRegionFactory(functionFactory, constraintChecker, precision, model.getNumStates(), model.getFirstInitialState(), simplifyRegions, splitMethod); - valueComputer = new ValueComputer(paramModel, regionFactory, precision, eliminationOrder, bisimType); + valueComputer = new ValueComputer(this, paramModel, regionFactory, precision, eliminationOrder, bisimType); long timer = 0; diff --git a/prism/src/param/ValueComputer.java b/prism/src/param/ValueComputer.java index 76acab31..428df1b3 100644 --- a/prism/src/param/ValueComputer.java +++ b/prism/src/param/ValueComputer.java @@ -32,12 +32,15 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map.Entry; +import prism.PrismComponent; + + /** * Computes values for properties of a parametric Markov model. * * @author Ernst Moritz Hahn (University of Oxford) */ -final class ValueComputer +final class ValueComputer extends PrismComponent { private enum PropType { REACH, @@ -230,7 +233,8 @@ final class ValueComputer private StateEliminator.EliminationOrder eliminationOrder; private Lumper.BisimType bisimType; - ValueComputer(ParamModel model, RegionFactory regionFactory, BigRational precision, StateEliminator.EliminationOrder eliminationOrder, Lumper.BisimType bisimType) { + ValueComputer(PrismComponent parent, ParamModel model, RegionFactory regionFactory, BigRational precision, StateEliminator.EliminationOrder eliminationOrder, Lumper.BisimType bisimType) { + super(parent); this.model = model; this.regionFactory = regionFactory; this.functionFactory = regionFactory.getFunctionFactory();