Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
mohawk-2.0
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jon Shahen
mohawk-2.0
Commits
d84c7632
Commit
d84c7632
authored
Nov 21, 2016
by
Jonathan Shahen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updating so that NuSMV class is no longer static
parent
45a3ae29
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
src/mohawk/refine/RolesAbsRefine.java
src/mohawk/refine/RolesAbsRefine.java
+7
-5
src/mohawk/singleton/MohawkSettings.java
src/mohawk/singleton/MohawkSettings.java
+0
-2
No files found.
src/mohawk/refine/RolesAbsRefine.java
View file @
d84c7632
...
...
@@ -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
=
run
NuSMV
.
BMC
(
bound
,
nusmv
.
getNuSMVCode
());
}
else
{
result
=
NuSMV
.
BMCFile
(
bound
,
nusmv
.
getFilename
());
result
=
run
NuSMV
.
BMCFile
(
bound
,
nusmv
.
getFilename
());
}
}
else
{
if
(
skipSMVFile
)
{
result
=
NuSMV
.
SMC
(
nusmv
.
getNuSMVCode
());
result
=
run
NuSMV
.
SMC
(
nusmv
.
getNuSMVCode
());
}
else
{
result
=
NuSMV
.
SMCFile
(
nusmv
.
getFilename
());
result
=
run
NuSMV
.
SMCFile
(
nusmv
.
getFilename
());
}
}
returnValue
=
NuSMV
.
execProcess
.
exitValue
();
returnValue
=
run
NuSMV
.
execProcess
.
exitValue
();
return
result
;
}
...
...
src/mohawk/singleton/MohawkSettings.java
View file @
d84c7632
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment