[mlpack-git] master: There is no such thing as a required output option. This commit removes printing those. (5506cbc)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/59bc0b32630a3ad786706993f4d5e8b087f1c702...0d9a0e263a32b99d8dcf5d2723b3b92c67e669fc

>---------------------------------------------------------------

commit 5506cbcc7c34d731c52f79f54b84c60801b98b34
Author: Ryan Curtin <ryan at ratml.org>
Date:   Wed Jul 13 16:05:06 2016 -0400

    There is no such thing as a required output option.
    This commit removes printing those.


>---------------------------------------------------------------

5506cbcc7c34d731c52f79f54b84c60801b98b34
 src/mlpack/core/util/cli.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/mlpack/core/util/cli.cpp b/src/mlpack/core/util/cli.cpp
index 323f2c5..dcc1db4 100644
--- a/src/mlpack/core/util/cli.cpp
+++ b/src/mlpack/core/util/cli.cpp
@@ -577,7 +577,7 @@ void CLI::PrintHelp(const std::string& param)
   else
     std::cout << "[undocumented program]" << std::endl << std::endl;
 
-  for (size_t pass = 0; pass < 4; ++pass)
+  for (size_t pass = 0; pass < 3; ++pass)
   {
     bool printedHeader = false;
 
@@ -603,11 +603,9 @@ void CLI::PrintHelp(const std::string& param)
       // Filter un-printed options.
       if ((pass == 0) && !(required && input)) // Required input options only.
         continue;
-      if ((pass == 1) && !(required && !input)) // Required output options only.
+      if ((pass == 1) && !(!required && input)) // Optional input options only.
         continue;
-      if ((pass == 2) && !(!required && input)) // Optional input options only.
-        continue;
-      if ((pass == 3) && (required || input)) // Optional output options only.
+      if ((pass == 2) && input) // Output options only (always optional).
         continue;
 
       if (!printedHeader)
@@ -616,14 +614,12 @@ void CLI::PrintHelp(const std::string& param)
         if (pass == 0)
           std::cout << "Required input options:" << std::endl << std::endl;
         else if (pass == 1)
-          std::cout << "Required output options:" << std::endl << std::endl;
-        else if (pass == 2)
           std::cout << "Optional input options: " << std::endl << std::endl;
-        else if (pass == 3)
+        else if (pass == 2)
           std::cout << "Optional output options: " << std::endl << std::endl;
       }
 
-      if (pass >= 2) // Append default value to description.
+      if (pass >= 1) // Append default value to description.
       {
         desc += "  Default value ";
         std::stringstream tmp;