projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model: embed the trace_analyses in the class
[model-checker.git]
/
model.cc
diff --git
a/model.cc
b/model.cc
index 03d7ba33b4646f48ed9e5a288ddf66be256c0470..8d5bc0fa3bab813c3a68b5fa149ae95b27c51800 100644
(file)
--- a/
model.cc
+++ b/
model.cc
@@
-30,7
+30,7
@@
ModelChecker::ModelChecker(struct model_params params) :
execution(new ModelExecution(¶ms, scheduler, node_stack)),
diverge(NULL),
earliest_diverge(NULL),
execution(new ModelExecution(¶ms, scheduler, node_stack)),
diverge(NULL),
earliest_diverge(NULL),
- trace_analyses(
new ModelVector<TraceAnalysis *>()
)
+ trace_analyses()
{
}
{
}
@@
-38,9
+38,8
@@
ModelChecker::ModelChecker(struct model_params params) :
ModelChecker::~ModelChecker()
{
delete node_stack;
ModelChecker::~ModelChecker()
{
delete node_stack;
- for (unsigned int i = 0; i < trace_analyses->size(); i++)
- delete (*trace_analyses)[i];
- delete trace_analyses;
+ for (unsigned int i = 0; i < trace_analyses.size(); i++)
+ delete trace_analyses[i];
delete scheduler;
}
delete scheduler;
}
@@
-328,8
+327,8
@@
bool ModelChecker::next_execution()
/** @brief Run trace analyses on complete trace */
void ModelChecker::run_trace_analyses() {
/** @brief Run trace analyses on complete trace */
void ModelChecker::run_trace_analyses() {
- for (unsigned int i = 0; i < trace_analyses
->
size(); i++)
-
(*trace_analyses)
[i]->analyze(execution->get_action_trace());
+ for (unsigned int i = 0; i < trace_analyses
.
size(); i++)
+
trace_analyses
[i]->analyze(execution->get_action_trace());
}
/**
}
/**