autfilt: --count

* src/bin/autfilt.cc: Add a --count option.
* src/tgbatest/randaut.test: Test autfilt's --count and --states.

src/bin/autfilt.cc

@@ -88,6 +88,7 @@ static const argp_option options[] =
       "of the given property)", 0 },
     /**************************************************/
     { 0, 0, 0, 0, "Output format:", 3 },
+    { "count", 'c', 0, 0, "print only a count of matched automata", 0 },
     { "dot", OPT_DOT, 0, 0, "GraphViz's format (default)", 0 },
     { "hoaf", 'H', "s|t|m|l", OPTION_ARG_OPTIONAL,
       "Output the automaton in HOA format.  Add letters to select "
@@ -169,9 +170,9 @@ static const struct argp_child children[] =
     { 0, 0, 0, 0 }
   };
 
-static enum output_format { Dot, Lbtt, Lbtt_t, Spin, Spot, Stats, Hoa, Quiet }
-  format = Dot;
-static bool one_match = false;
+static enum output_format { Dot, Lbtt, Lbtt_t, Spin, Spot, Stats, Hoa,
+			    Quiet, Count } format = Dot;
+static long int match_count = 0;
 static const char* stats = "";
 static const char* hoa_opt = 0;
 static spot::option_map extra_options;
@@ -209,6 +210,9 @@ parse_opt(int key, char* arg, struct argp_state*)
     case 'B':
       type = spot::postprocessor::BA;
       break;
+    case 'c':
+      format = Count;
+      break;
     case 'F':
       jobs.emplace_back(arg, true);
       break;
@@ -459,7 +463,7 @@ namespace
       if (matched == opt_invert)
         return 0;
 
-      one_match = true;
+      ++match_count;
 
       // Postprocessing.
 
@@ -475,6 +479,10 @@ namespace
 
       switch (format)
 	{
+	case Count:
+	case Quiet:
+	  // Do not output anything.
+	  break;
 	case Dot:
 	  spot::dotty_reachable(std::cout, aut,
 				(type == spot::postprocessor::BA)
@@ -489,9 +497,6 @@ namespace
 	case Hoa:
 	  spot::hoa_reachable(std::cout, aut, hoa_opt) << '\n';
 	  break;
-	case Quiet:
-	  // Do not output anything.
-	  break;
 	case Spot:
 	  spot::tgba_save_reachable(std::cout, aut);
 	  break;
@@ -579,5 +584,8 @@ main(int argc, char** argv)
     {
       error(2, 0, "%s", e.what());
     }
-  return one_match ? 0 : 1;
+
+  if (format == Count)
+    std::cout << match_count << std::endl;
+  return !match_count;
 }

src/tgbatest/randaut.test

@@ -23,6 +23,7 @@
 set -e
 
 randaut=../../bin/randaut
+autfilt=../../bin/autfilt
 
 $randaut --spin -S4 a b | ../ltl2tgba -H -XN - >out
 grep 'States: 4' out
@@ -46,3 +47,8 @@ grep 'ba.*incompatible' stderr
 
 $randaut --ba -A0 3 2>stderr && exit 1
 grep 'ba.*incompatible' stderr
+
+$randaut --states 10..20 2 -n 100 -H > aut.hoa
+a=`$autfilt --states=..14 -c <aut.hoa`
+b=`$autfilt aut.hoa --states=15.. -c`
+test `expr $a + $b` = 100