- 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.
This commit is contained in:
		
							parent
							
								
									32f226f782
								
							
						
					
					
						commit
						cb2aef3915
					
				
							
								
								
									
										89
									
								
								src/main.c
									
									
									
									
									
								
							
							
						
						
									
										89
									
								
								src/main.c
									
									
									
									
									
								
							@ -304,60 +304,67 @@ timersPrint (const System sys)
 | 
				
			|||||||
      globalError++;
 | 
					      globalError++;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  //**********************************************************************
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /* states traversed */
 | 
					  /* states traversed */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  eprintf ("states\t");
 | 
					  if (switches.engine == POR_ENGINE)
 | 
				
			||||||
  statesPrintShort (sys);
 | 
					 | 
				
			||||||
  eprintf ("\n");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  /* scenario info */
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  if (switches.scenario > 0)
 | 
					 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
      eprintf ("scen_st\t");
 | 
					      eprintf ("states\t");
 | 
				
			||||||
      statesFormat (sys->statesScenario);
 | 
					      statesPrintShort (sys);
 | 
				
			||||||
      eprintf ("\n");
 | 
					      eprintf ("\n");
 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /* flag
 | 
					      /* scenario info */
 | 
				
			||||||
   *
 | 
					 | 
				
			||||||
   * L n          Attack of length <n>
 | 
					 | 
				
			||||||
   * None         failed claim
 | 
					 | 
				
			||||||
   * NoClaim      no claims
 | 
					 | 
				
			||||||
   */
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  eprintf ("attack\t");
 | 
					      if (switches.scenario > 0)
 | 
				
			||||||
  if (sys->claims == STATES0)
 | 
						{
 | 
				
			||||||
    {
 | 
						  eprintf ("scen_st\t");
 | 
				
			||||||
      eprintf ("NoClaim\n");
 | 
						  statesFormat (sys->statesScenario);
 | 
				
			||||||
    }
 | 
						  eprintf ("\n");
 | 
				
			||||||
  else
 | 
						}
 | 
				
			||||||
    {
 | 
					
 | 
				
			||||||
      if (sys->failed != STATES0)
 | 
					      /* flag
 | 
				
			||||||
	eprintf ("L:%i\n", attackLength (sys->attack));
 | 
					       *
 | 
				
			||||||
 | 
					       * L n          Attack of length <n>
 | 
				
			||||||
 | 
					       * None         failed claim
 | 
				
			||||||
 | 
					       * NoClaim      no claims
 | 
				
			||||||
 | 
					       */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      eprintf ("attack\t");
 | 
				
			||||||
 | 
					      if (sys->claims == STATES0)
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
						  eprintf ("NoClaim\n");
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
      else
 | 
					      else
 | 
				
			||||||
	eprintf ("None\n");
 | 
						{
 | 
				
			||||||
    }
 | 
						  if (sys->failed != STATES0)
 | 
				
			||||||
 | 
						    eprintf ("L:%i\n", attackLength (sys->attack));
 | 
				
			||||||
 | 
						  else
 | 
				
			||||||
 | 
						    eprintf ("None\n");
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef NOTIMERS
 | 
					#ifndef NOTIMERS
 | 
				
			||||||
  /* print time */
 | 
					      /* print time */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  double seconds;
 | 
					      double seconds;
 | 
				
			||||||
  seconds = (double) clock () / CLOCKS_PER_SEC;
 | 
					      seconds = (double) clock () / CLOCKS_PER_SEC;
 | 
				
			||||||
  eprintf ("time\t%.3e\n", seconds);
 | 
					      eprintf ("time\t%.3e\n", seconds);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /* states per second */
 | 
					      /* states per second */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  eprintf ("st/sec\t");
 | 
					      eprintf ("st/sec\t");
 | 
				
			||||||
  if (seconds > 0)
 | 
					      if (seconds > 0)
 | 
				
			||||||
    {
 | 
						{
 | 
				
			||||||
      eprintf ("%.3e\n", statesDouble (sys->states) / seconds);
 | 
						  eprintf ("%.3e\n", statesDouble (sys->states) / seconds);
 | 
				
			||||||
    }
 | 
						}
 | 
				
			||||||
  else
 | 
					      else
 | 
				
			||||||
    {
 | 
						{
 | 
				
			||||||
      eprintf ("<inf>\n");
 | 
						  eprintf ("<inf>\n");
 | 
				
			||||||
    }
 | 
						}
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  //**********************************************************************
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /* Print also individual claims */
 | 
					  /* Print also individual claims */
 | 
				
			||||||
  /* Note that if the output is set to empty, the claim output is redirected to stdout (for e.g. processing)
 | 
					  /* Note that if the output is set to empty, the claim output is redirected to stdout (for e.g. processing)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user