From d84c7632443ed325215d65932c25e1ce1f02b5f8 Mon Sep 17 00:00:00 2001 From: Jonathan Shahen Date: Mon, 21 Nov 2016 20:28:24 -0500 Subject: [PATCH] Updating so that NuSMV class is no longer static --- src/mohawk/refine/RolesAbsRefine.java | 12 +++++++----- src/mohawk/singleton/MohawkSettings.java | 2 -- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mohawk/refine/RolesAbsRefine.java b/src/mohawk/refine/RolesAbsRefine.java index 80c6ba6..63ab15d 100644 --- a/src/mohawk/refine/RolesAbsRefine.java +++ b/src/mohawk/refine/RolesAbsRefine.java @@ -17,6 +17,7 @@ import mohawk.math.CalculateDiameter; import mohawk.output.WriteNuSMV; import mohawk.output.WriteRBACSpec; import mohawk.rbac.RBACInstance; +import mohawk.singleton.MohawkSettings; /** * @author kjayaram @@ -105,6 +106,7 @@ public class RolesAbsRefine { // NuSMV bmc Boolean result; + NuSMV runNuSMV = new NuSMV(MohawkSettings.getInstance().getNuSMV_filepath()); if (mode == NuSMVMode.BMC) { // CalculateDiameter diameter = new CalculateDiameter(); // NEVER USED int bound = CalculateDiameter.GetDiameter(curInstance); @@ -112,20 +114,20 @@ public class RolesAbsRefine { curInstance.getNumRoles(), bound)); if (skipSMVFile) { - result = NuSMV.BMC(bound, nusmv.getNuSMVCode()); + result = runNuSMV.BMC(bound, nusmv.getNuSMVCode()); } else { - result = NuSMV.BMCFile(bound, nusmv.getFilename()); + result = runNuSMV.BMCFile(bound, nusmv.getFilename()); } } else { if (skipSMVFile) { - result = NuSMV.SMC(nusmv.getNuSMVCode()); + result = runNuSMV.SMC(nusmv.getNuSMVCode()); } else { - result = NuSMV.SMCFile(nusmv.getFilename()); + result = runNuSMV.SMCFile(nusmv.getFilename()); } } - returnValue = NuSMV.execProcess.exitValue(); + returnValue = runNuSMV.execProcess.exitValue(); return result; } diff --git a/src/mohawk/singleton/MohawkSettings.java b/src/mohawk/singleton/MohawkSettings.java index 141d8ae..ce0c317 100644 --- a/src/mohawk/singleton/MohawkSettings.java +++ b/src/mohawk/singleton/MohawkSettings.java @@ -2,7 +2,6 @@ package mohawk.singleton; import java.util.logging.Level; -import mohawk.global.nusmv.NuSMV; import mohawk.global.results.MohawkResults; import mohawk.global.results.TestingResult; import mohawk.global.timing.MohawkTiming; @@ -30,7 +29,6 @@ public class MohawkSettings { public void setNuSMV_filepath(String nuSMV_filepath) { NuSMV_filepath = nuSMV_filepath; - NuSMV.NuSMVProcessName = nuSMV_filepath; } // Helpers -- GitLab