Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
ProB 2 Jupyter Kernel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
general
stups
ProB 2 Jupyter Kernel
Commits
1101b4fa
Commit
1101b4fa
authored
5 years ago
by
dgelessus
Browse files
Options
Downloads
Patches
Plain Diff
Display status information while :modelcheck is running
parent
d3aacd9f
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/de/prob2/jupyter/commands/ModelCheckCommand.java
+54
-2
54 additions, 2 deletions
...ain/java/de/prob2/jupyter/commands/ModelCheckCommand.java
with
54 additions
and
2 deletions
src/main/java/de/prob2/jupyter/commands/ModelCheckCommand.java
+
54
−
2
View file @
1101b4fa
package
de.prob2.jupyter.commands
;
package
de.prob2.jupyter.commands
;
import
java.util.concurrent.atomic.AtomicLong
;
import
com.google.inject.Inject
;
import
com.google.inject.Inject
;
import
com.google.inject.Provider
;
import
de.prob.check.CheckError
;
import
de.prob.check.CheckError
;
import
de.prob.check.ConsistencyChecker
;
import
de.prob.check.ConsistencyChecker
;
import
de.prob.check.IModelCheckListener
;
import
de.prob.check.IModelCheckingResult
;
import
de.prob.check.IModelCheckingResult
;
import
de.prob.check.ModelCheckErrorUncovered
;
import
de.prob.check.ModelCheckErrorUncovered
;
import
de.prob.check.ModelCheckingOptions
;
import
de.prob.check.NotYetFinished
;
import
de.prob.check.NotYetFinished
;
import
de.prob.check.StateSpaceStats
;
import
de.prob.statespace.AnimationSelector
;
import
de.prob.statespace.AnimationSelector
;
import
de.prob.statespace.StateSpace
;
import
de.prob.statespace.StateSpace
;
import
de.prob2.jupyter.ProBKernel
;
import
de.prob2.jupyter.UserErrorException
;
import
de.prob2.jupyter.UserErrorException
;
import
io.github.spencerpark.jupyter.kernel.JupyterIO
;
import
io.github.spencerpark.jupyter.kernel.ReplacementOptions
;
import
io.github.spencerpark.jupyter.kernel.ReplacementOptions
;
import
io.github.spencerpark.jupyter.kernel.display.DisplayData
;
import
io.github.spencerpark.jupyter.kernel.display.DisplayData
;
...
@@ -18,12 +26,16 @@ import org.jetbrains.annotations.NotNull;
...
@@ -18,12 +26,16 @@ import org.jetbrains.annotations.NotNull;
import
org.jetbrains.annotations.Nullable
;
import
org.jetbrains.annotations.Nullable
;
public
final
class
ModelCheckCommand
implements
Command
{
public
final
class
ModelCheckCommand
implements
Command
{
private
static
final
AtomicLong
idCounter
=
new
AtomicLong
();
private
final
@NotNull
Provider
<
@NotNull
ProBKernel
>
kernelProvider
;
private
final
@NotNull
AnimationSelector
animationSelector
;
private
final
@NotNull
AnimationSelector
animationSelector
;
@Inject
@Inject
private
ModelCheckCommand
(
final
@NotNull
AnimationSelector
animationSelector
)
{
private
ModelCheckCommand
(
final
@NotNull
Provider
<
@NotNull
ProBKernel
>
kernelProvider
,
final
@NotNull
AnimationSelector
animationSelector
)
{
super
();
super
();
this
.
kernelProvider
=
kernelProvider
;
this
.
animationSelector
=
animationSelector
;
this
.
animationSelector
=
animationSelector
;
}
}
...
@@ -42,6 +54,25 @@ public final class ModelCheckCommand implements Command {
...
@@ -42,6 +54,25 @@ public final class ModelCheckCommand implements Command {
return
"If an error state is found, it is made the current state, so that it can be inspected using `:trace`, `:check`, etc."
;
return
"If an error state is found, it is made the current state, so that it can be inspected using `:trace`, `:check`, etc."
;
}
}
private
static
@NotNull
String
formatMillisecondsAsSeconds
(
final
long
milliseconds
)
{
return
String
.
format
(
"%d.%03d"
,
milliseconds
/
1000
,
milliseconds
%
1000
);
}
private
static
@NotNull
String
formatModelCheckStats
(
final
long
timeElapsed
,
final
@Nullable
StateSpaceStats
stats
)
{
final
StringBuilder
sb
=
new
StringBuilder
(
formatMillisecondsAsSeconds
(
timeElapsed
));
sb
.
append
(
" sec"
);
if
(
stats
!=
null
)
{
sb
.
append
(
", "
);
sb
.
append
(
stats
.
getNrProcessedNodes
());
sb
.
append
(
" of "
);
sb
.
append
(
stats
.
getNrTotalNodes
());
sb
.
append
(
" states processed, "
);
sb
.
append
(
stats
.
getNrTotalTransitions
());
sb
.
append
(
" transitions"
);
}
return
sb
.
toString
();
}
@Override
@Override
public
@NotNull
DisplayData
run
(
final
@NotNull
String
argString
)
{
public
@NotNull
DisplayData
run
(
final
@NotNull
String
argString
)
{
if
(!
argString
.
isEmpty
())
{
if
(!
argString
.
isEmpty
())
{
...
@@ -49,7 +80,28 @@ public final class ModelCheckCommand implements Command {
...
@@ -49,7 +80,28 @@ public final class ModelCheckCommand implements Command {
}
}
final
StateSpace
stateSpace
=
this
.
animationSelector
.
getCurrentTrace
().
getStateSpace
();
final
StateSpace
stateSpace
=
this
.
animationSelector
.
getCurrentTrace
().
getStateSpace
();
final
ConsistencyChecker
job
=
new
ConsistencyChecker
(
stateSpace
);
final
JupyterIO
io
=
this
.
kernelProvider
.
get
().
getIO
();
// Create the DisplayData that will be used to display status updates.
final
String
statusDataId
=
ModelCheckCommand
.
class
.
getName
()
+
" status "
+
idCounter
.
getAndIncrement
();
final
DisplayData
data
=
new
DisplayData
(
""
);
data
.
setDisplayId
(
statusDataId
);
io
.
display
.
display
(
data
);
final
ConsistencyChecker
job
=
new
ConsistencyChecker
(
stateSpace
,
ModelCheckingOptions
.
DEFAULT
,
null
,
new
IModelCheckListener
()
{
@Override
public
void
updateStats
(
final
@NotNull
String
jobId
,
final
long
timeElapsed
,
final
@NotNull
IModelCheckingResult
result
,
final
@Nullable
StateSpaceStats
stats
)
{
io
.
display
.
updateDisplay
(
statusDataId
,
new
DisplayData
(
formatModelCheckStats
(
timeElapsed
,
stats
)
+
"\n"
+
result
.
getMessage
()));
}
@Override
public
void
isFinished
(
final
@NotNull
String
jobId
,
final
long
timeElapsed
,
final
@NotNull
IModelCheckingResult
result
,
final
@Nullable
StateSpaceStats
stats
)
{
// Same as updateStats, except that the result is not included, because the final result will be displayed as the main command result instead of in the status.
io
.
display
.
updateDisplay
(
statusDataId
,
new
DisplayData
(
formatModelCheckStats
(
timeElapsed
,
stats
)));
}
});
final
IModelCheckingResult
result
=
job
.
call
();
final
IModelCheckingResult
result
=
job
.
call
();
final
StringBuilder
sbPlain
=
new
StringBuilder
();
final
StringBuilder
sbPlain
=
new
StringBuilder
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment