From acd8ea491c273a695b7484abba9e83aac3203dd3 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Thu, 9 Feb 2012 22:10:35 +0000 Subject: [PATCH] Code tidy git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4565 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/prism/Prism.java | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/prism/src/prism/Prism.java b/prism/src/prism/Prism.java index 9e7b3968..b69888d0 100644 --- a/prism/src/prism/Prism.java +++ b/prism/src/prism/Prism.java @@ -133,24 +133,24 @@ public class Prism implements PrismSettingsListener // A few miscellaneous options (i.e. defunct/hidden/undocumented/etc.) // See constructor below for default values - private boolean doReach; // do reachability? (sometimes might want to skip it) - private boolean bsccComp; // do bscc computation before steady-state? - private boolean checkZeroLoops; + private boolean doReach = true; // do reachability? (sometimes might want to skip it) + private boolean bsccComp = true; // do bscc computation before steady-state? + private boolean checkZeroLoops = false; // MTBDD construction method (NOW DEFUNCT) // 1 - use with ordering 1: nondet vars form a tree at the top // 3 - use with ordering 2: zero for nonexistant bits // nb: option 2 removed because it was stupid - private int construction; + private int construction = 3; // MTBDD variable ordering // 1 - (s ... s) (l ... l) (r c ... r c) // 2 - (s l ... l r c ... r c) (s l ... l r c ... r c) ... - private int ordering; + private int ordering = 1; // Round-off threshold for places where doubles are summed and compared to integers // (e.g. checking that probabilities sum to 1 in an update). - private double sumRoundOff; + private double sumRoundOff = 1e-5; //------------------------------------------------------------------------------ // Logs @@ -233,14 +233,6 @@ public class Prism implements PrismSettingsListener settings.addSettingsListener(this); // create list of model listeners modelListeners = new ArrayList(); - - // default values for miscellaneous options - doReach = true; - bsccComp = true; - checkZeroLoops = false; - construction = 3; - ordering = 1; - sumRoundOff = 1e-5; } // Set methods