s14h
/
prism-accumulation
1
0
Fork 0
Code Releases Activity
Browse Source

Tidy up reachability code: strip out old diagnostic output, uncomment frontier method for easier testing. 

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4662 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 14 years ago
parent
be4417dbe9
commit
3199c3daa2
1 changed files with 78 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 93
      prism/src/mtbdd/PM_Reachability.cc

93
prism/src/mtbdd/PM_Reachability.cc
View File

@ -66,18 +66,18 @@ jint info // how much diagnostic info to display (0=none, 1=some)
// start clocks
start1 = util_cpu_time();
// reachability fixpoint loop - option 1
// here...
int method = 1;
if (method == 1) {
// initialise
done = false;
iters = 0;
Cudd_Ref(init);
reach = DD_PermuteVariables(ddman, init, rvars, cvars, num_rvars);
// PM_PrintToMainLog(env, "Reachability:\n");
while (!done) {
iters++;
// output info on progress
if (info > 0) {
PM_PrintToMainLog(env, "Iteration %d:", iters);
@ -85,40 +85,20 @@ jint info // how much diagnostic info to display (0=none, 1=some)
PM_PrintToMainLog(env, " (%d nodes)", DD_GetNumNodes(ddman, reach));
start2 = util_cpu_time();
}
// PM_PrintToMainLog(env, "[permute(%d)", DD_GetNumNodes(ddman, reach));
// start3 = util_cpu_time();
// perform iteration
Cudd_Ref(reach);
tmp = DD_PermuteVariables(ddman, reach, cvars, rvars, num_cvars);
// stop = util_cpu_time();
// PM_PrintToMainLog(env, "=%fs]", (double)(stop - start3)/1000);
// PM_PrintToMainLog(env, "[and(%d,%d)", DD_GetNumNodes(ddman, tmp), DD_GetNumNodes(ddman, trans01));
// start3 = util_cpu_time();
Cudd_Ref(trans01);
tmp = DD_And(ddman, tmp, trans01);
// stop = util_cpu_time();
// PM_PrintToMainLog(env, "=%fs]", (double)(stop - start3)/1000);
// PM_PrintToMainLog(env, "[thereexists(%d)", DD_GetNumNodes(ddman, tmp));
// start3 = util_cpu_time();
tmp = DD_ThereExists(ddman, tmp, rvars, num_rvars);
// stop = util_cpu_time();
// PM_PrintToMainLog(env, "=%fs]", (double)(stop - start3)/1000);
// PM_PrintToMainLog(env, "[or(%d,%d)", DD_GetNumNodes(ddman, reach), DD_GetNumNodes(ddman, tmp));
// start3 = util_cpu_time();
Cudd_Ref(reach);
tmp = DD_Or(ddman, reach, tmp);
// stop = util_cpu_time();
// PM_PrintToMainLog(env, "=%fs]", (double)(stop - start3)/1000);
// check convergence
if (tmp == reach) {
done = true;
}
Cudd_RecursiveDeref(ddman, reach);
reach = tmp;
// output info on progress
if (info > 0) {
stop = util_cpu_time();
@ -126,71 +106,52 @@ jint info // how much diagnostic info to display (0=none, 1=some)
}
}
reach = DD_PermuteVariables(ddman, reach, cvars, rvars, num_cvars);
// ...to here
// reachability fixpoint loop - option 2
// here...
/*done = false;
}
else {
// initialise
done = false;
iters = 0;
Cudd_Ref(init);
reach = init;
Cudd_Ref(reach);
frontier = reach;
// PM_PrintToMainLog(env, "Reachability:\n");
while (!done) {
// start2 = util_cpu_time();
iters++;
// PM_PrintToMainLog(env, "Iteration %d: ", iters);
// PM_PrintToMainLog(env, "%0.f (%d) ", DD_GetNumMinterms(ddman, reach, num_rvars), DD_GetNumNodes(ddman, reach));
// PM_PrintToMainLog(env, "%0.f (%d) ", DD_GetNumMinterms(ddman, frontier, num_rvars), DD_GetNumNodes(ddman, frontier));
// start3 = util_cpu_time();
// PM_PrintToMainLog(env, "[permute(%d)", DD_GetNumNodes(ddman, frontier));
// output info on progress
if (info > 0) {
PM_PrintToMainLog(env, "Iteration %d:", iters);
PM_PrintToMainLog(env, " %0.f states", DD_GetNumMinterms(ddman, reach, num_rvars));
PM_PrintToMainLog(env, " (%d nodes)", DD_GetNumNodes(ddman, reach));
start2 = util_cpu_time();
}
// perform iteration
Cudd_Ref(frontier);
tmp = DD_PermuteVariables(ddman, frontier, cvars, rvars, num_cvars);
// stop = util_cpu_time();
// PM_PrintToMainLog(env, "=%fs]", (double)(stop - start3)/1000);
// start3 = util_cpu_time();
// PM_PrintToMainLog(env, "[and(%d,%d)", DD_GetNumNodes(ddman, tmp), DD_GetNumNodes(ddman, trans01));
Cudd_Ref(trans01);
tmp = DD_And(ddman, tmp, trans01);
// stop = util_cpu_time();
// PM_PrintToMainLog(env, "=%fs]", (double)(stop - start3)/1000);
// start3 = util_cpu_time();
// PM_PrintToMainLog(env, "[thereexists(%d)", DD_GetNumNodes(ddman, tmp));
tmp = DD_ThereExists(ddman, tmp, rvars, num_rvars);
// stop = util_cpu_time();
// PM_PrintToMainLog(env, "=%fs]", (double)(stop - start3)/1000);
// start3 = util_cpu_time();
// PM_PrintToMainLog(env, "[or(%d,%d)", DD_GetNumNodes(ddman, reach), DD_GetNumNodes(ddman, tmp));
Cudd_Ref(reach);
tmp = DD_Or(ddman, reach, tmp);
// stop = util_cpu_time();
// PM_PrintToMainLog(env, "=%fs]", (double)(stop - start3)/1000);
// start3 = util_cpu_time();
// PM_PrintToMainLog(env, "[and(%d,not(%d))", DD_GetNumNodes(ddman, tmp), DD_GetNumNodes(ddman, reach));
Cudd_RecursiveDeref(ddman, frontier);
Cudd_Ref(tmp);
Cudd_Ref(reach);
frontier = DD_And(ddman, tmp, DD_Not(ddman, reach));
// stop = util_cpu_time();
// PM_PrintToMainLog(env, "=%fs]", (double)(stop - start3)/1000);
// check convergence
if (frontier == Cudd_ReadZero(ddman)) {
done = true;
}
Cudd_RecursiveDeref(ddman, reach);
reach = tmp;
// stop = util_cpu_time();
// PM_PrintToMainLog(env, " total=%fs\n", (double)(stop - start2)/1000);
// output info on progress
if (info > 0) {
stop = util_cpu_time();
PM_PrintToMainLog(env, " (%.2f seconds)\n", (double)(stop - start2)/1000);
}
}
reach = DD_PermuteVariables(ddman, reach, cvars, rvars, num_cvars);
Cudd_RecursiveDeref(ddman, frontier);*/
// ...to here
Cudd_RecursiveDeref(ddman, frontier);
}
// stop clock
stop = util_cpu_time();

Write Preview
Loading…
Cancel
Save