From 72be9a6441541920af620c945b0666a6204fd33e Mon Sep 17 00:00:00 2001 From: ccremers Date: Tue, 13 Jul 2004 12:19:03 +0000 Subject: [PATCH] - Moved the attack path display logic to output.c completely. - Adjusting output slightly. --- src/modelchecker.c | 3 +-- src/output.c | 8 +++++++- src/output.h | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/modelchecker.c b/src/modelchecker.c index 8364191..b08dd43 100644 --- a/src/modelchecker.c +++ b/src/modelchecker.c @@ -1043,8 +1043,7 @@ violateClaim (const System sys, int length, int claimev, Termlist reqt) /* mark the path in the state graph? */ if (sys->switchStatespace) { - graphNodePath (sys,length,"shape=parallelogram,color=red"); - graphEdgePath (sys,length-1,"color=red"); + graphPath (sys, length); } /* Copy the current trace to the buffer, if the new one is shorter than the previous one. */ diff --git a/src/output.c b/src/output.c index 79c7e2b..f5c3206 100644 --- a/src/output.c +++ b/src/output.c @@ -572,7 +572,7 @@ void graphNode (const System sys) printf ("#%i\"", sys->traceRun[index]); if (rd->type == CLAIM) { - printf (",color=green"); + printf (",shape=house,color=green"); } } /* a choose? */ @@ -620,3 +620,9 @@ void graphEdgePath (const System sys, const int length, const char* edgepar) i++; } } + +void graphPath (const System sys, int length) +{ + graphNodePath (sys,length,"shape=parallelogram,style=bold,color=red"); + graphEdgePath (sys,length-1,"style=bold,color=red"); +} diff --git a/src/output.h b/src/output.h index ef7f5d0..5c9b8a4 100644 --- a/src/output.h +++ b/src/output.h @@ -12,5 +12,6 @@ void graphNodePath (const System sys, const int length, const char* nodepar); void graphEdgePath (const System sys, const int length, const char* edgepar); +void graphPath (const System sys, int length); #endif