From cb2aef3915a5c7b56e56225d5de75f451d6b4f93 Mon Sep 17 00:00:00 2001 From: ccremers Date: Mon, 26 Dec 2005 16:28:45 +0000 Subject: [PATCH] - Old state/time info has now been removed. This was only needed for the POR engine anyway, so that's where it is shown now. --- src/main.c | 89 +++++++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 41 deletions(-) diff --git a/src/main.c b/src/main.c index f00becc..40637e0 100644 --- a/src/main.c +++ b/src/main.c @@ -304,60 +304,67 @@ timersPrint (const System sys) globalError++; } + //********************************************************************** + /* states traversed */ - eprintf ("states\t"); - statesPrintShort (sys); - eprintf ("\n"); - - /* scenario info */ - - if (switches.scenario > 0) + if (switches.engine == POR_ENGINE) { - eprintf ("scen_st\t"); - statesFormat (sys->statesScenario); + eprintf ("states\t"); + statesPrintShort (sys); eprintf ("\n"); - } - /* flag - * - * L n Attack of length - * None failed claim - * NoClaim no claims - */ + /* scenario info */ - eprintf ("attack\t"); - if (sys->claims == STATES0) - { - eprintf ("NoClaim\n"); - } - else - { - if (sys->failed != STATES0) - eprintf ("L:%i\n", attackLength (sys->attack)); + if (switches.scenario > 0) + { + eprintf ("scen_st\t"); + statesFormat (sys->statesScenario); + eprintf ("\n"); + } + + /* flag + * + * L n Attack of length + * None failed claim + * NoClaim no claims + */ + + eprintf ("attack\t"); + if (sys->claims == STATES0) + { + eprintf ("NoClaim\n"); + } else - eprintf ("None\n"); - } + { + if (sys->failed != STATES0) + eprintf ("L:%i\n", attackLength (sys->attack)); + else + eprintf ("None\n"); + } #ifndef NOTIMERS - /* print time */ + /* print time */ - double seconds; - seconds = (double) clock () / CLOCKS_PER_SEC; - eprintf ("time\t%.3e\n", seconds); + double seconds; + seconds = (double) clock () / CLOCKS_PER_SEC; + eprintf ("time\t%.3e\n", seconds); - /* states per second */ + /* states per second */ - eprintf ("st/sec\t"); - if (seconds > 0) - { - eprintf ("%.3e\n", statesDouble (sys->states) / seconds); - } - else - { - eprintf ("\n"); - } + eprintf ("st/sec\t"); + if (seconds > 0) + { + eprintf ("%.3e\n", statesDouble (sys->states) / seconds); + } + else + { + eprintf ("\n"); + } #endif + } + + //********************************************************************** /* Print also individual claims */ /* Note that if the output is set to empty, the claim output is redirected to stdout (for e.g. processing)