Changeset 975

Timestamp:

Oct 17, 2007, 11:03:37 PM (16 years ago)

Author:

Peter

Message:

adding Option class for argument associated with a file, and fixed minor issues

Location:

trunk

Files:

• test/commandline_test.cc (modified) (2 diffs)
• yat/utility/CommandLine.cc (modified) (1 diff)
• yat/utility/Makefile.am (modified) (2 diffs)
• yat/utility/Option.cc (modified) (1 diff)
• yat/utility/OptionArg.h (modified) (3 diffs)
• yat/utility/OptionFile.cc (added)
• yat/utility/OptionFile.h (added)

trunk/test/commandline_test.cc

@@ -24 +24 @@
 #include "yat/utility/CommandLine.h"
 #include "yat/utility/OptionArg.h"
+#include "yat/utility/OptionFile.h"
 #include "yat/utility/OptionSwitch.h"
 
@@ -61 +62 @@
   }
 
+  CommandLine cmd;
+  OptionFile file(cmd, "f,file", "description");
+
   if (!ok)
     *error << "commandline test failed" << std::endl;

trunk/yat/utility/CommandLine.cc

@@ -135 +135 @@
         }
       }
-      for_each(options_.begin(),options_.end(),std::mem_fun(&Option::validate)); 
+      for_each(options_.begin(),options_.end(),
+               std::mem_fun(&Option::validate)); 
     }
     catch (std::runtime_error& e){
       std::stringstream ss;
-      ss << program_name_ << ": " << e.what() << "\n" << try_help();
+      ss << program_name_ << ": " << e.what();
       throw std::runtime_error(ss.str());
     }

trunk/yat/utility/Makefile.am

@@ -27 +27 @@
 libutility_la_SOURCES = \
   Alignment.cc ColumnStream.cc CommandLine.cc FileUtil.cc kNNI.cc \
-  matrix.cc NNI.cc Option.cc OptionSwitch.cc \
+  matrix.cc NNI.cc Option.cc OptionFile.cc OptionSwitch.cc \
   PCA.cc stl_utility.cc SVD.cc TypeInfo.cc utility.cc vector.cc WeNNI.cc
 
@@ -36 +36 @@
   Exception.h FileUtil.h Iterator.h iterator_traits.h \
   IteratorWeighted.h kNNI.h matrix.h NNI.h \
-  Option.h OptionArg.h OptionSwitch.h \
+  Option.h OptionArg.h OptionFile.h OptionSwitch.h \
   PCA.h stl_utility.h SVD.h TypeInfo.h utility.h vector.h WeNNI.h \
   yat_assert.h

trunk/yat/utility/Option.cc

@@ -39 +39 @@
   {
     if (flag.empty())
-      throw std::runtime_error("Option: given flag is empty");
+      throw std::runtime_error("yat: Option: given flag is empty");
     if (flag.size()==1 || (flag.size()==2 && flag[1]==','))
       short_name_ = flag[0];

trunk/yat/utility/OptionArg.h

@@ -29 +29 @@
 #include <stdexcept>
 #include <string>
+#include <sstream>
 
 namespace theplu {
@@ -62 +63 @@
        \return value
     */
-    T value(void) { return value_; }
+    T value(void) const { return value_; }
 
   private:
@@ -116 +117 @@
     /**
      */
-    void do_validate(void) const {}
+    virtual void do_validate(void) const {}
 
   };