Changeset 718 for trunk/yat/utility

Timestamp:

Dec 26, 2006, 10:56:26 AM (16 years ago)

Author:

Jari Häkkinen

Message:

Addresses #170.

Location:

trunk/yat/utility

Files:

• CommandLine.cc (modified) (4 diffs)
• CommandLine.h (modified) (6 diffs)
• Exception.h (modified) (1 diff)
• NNI.cc (modified) (2 diffs)
• NNI.h (modified) (1 diff)

trunk/yat/utility/CommandLine.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2006 Peter Johansson
+  Copyright (C) 2006 Peter Johansson, Jari Hakkinen
 
   This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -98 +98 @@
       add('\0', name, arg, description);
   }
-  
+
 
   void CommandLine::add_parameter(char name,
@@ -107 +107 @@
   }
   
+
+  void CommandLine::add_parameter(char short_name, const std::string& long_name,
+                                  Option::argument_type arg,
+                                  const std::string& description)
+  {
+    add(short_name, long_name, arg, description);
+  }
+
+
+  bool CommandLine::is_long_option(const std::string& str)
+  {
+    return (str.size()>3 && str[0]=='-' && str[1]=='-');
+  }
+
+
+  bool CommandLine::is_short_option(const std::string& str)
+  {
+    return (str.size()==2 && str[0]=='-' && isalpha(str[1]));
+  }
+
+
+  u_int& CommandLine::max_argument(void)
+  {
+    return max_argument_;
+  }
+
+
+  u_int& CommandLine::min_argument(void)
+  {
+    return min_argument_;
+  }
+
 
   void CommandLine::parse(int argc,const char* argv[])
@@ -147 +179 @@
     }
   }
-  
+
+
+  void CommandLine::set_general_description(const std::string& description)
+  {
+    general_description_=description;
+  }
+
 
   bool CommandLine::update(const std::string& key, 

trunk/yat/utility/CommandLine.h

@@ -5 +5 @@
 
 /*
-  Copyright (C) 2006 Peter Johansson
+  Copyright (C) 2006 Peter Johansson, Jari Hakkinen
 
   This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -136 +136 @@
     /// @param description string used in help display
     ///
-    inline void add_parameter(const char short_name,
-                              const std::string& long_name,
-                              Option::argument_type arg = Option::no_arg,
-                              const std::string& description = std::string())
-    { add(short_name, long_name, arg, description); }
+    void add_parameter(char short_name, const std::string& long_name,
+                       Option::argument_type arg = Option::no_arg,
+                       const std::string& description = std::string());
 
     ///
@@ -153 +151 @@
     /// @return maximal number of arguments allowed.
     ///
-    inline u_int& max_argument(void) { return max_argument_; }
+    u_int& max_argument(void);
 
     ///
@@ -161 +159 @@
     /// @return minimal number of arguments allowed.
     ///
-    inline u_int& min_argument(void) { return min_argument_; }
+    u_int& min_argument(void);
 
     ///
@@ -184 +182 @@
     /// giving a general explanation what program is doing.
     ///
-    inline void set_general_description(const std::string& description)
-    { general_description_=description; }
+    void set_general_description(const std::string& description);
 
     ///
@@ -222 +219 @@
     void usage(void) const;
 
-    private:
+  private:
     Option* add(char short_name,
                 const std::string& long_name,
                 Option::argument_type arg,
                 const std::string& describtion);
-
-    inline bool is_long_option(const std::string& str)
-    { return (str.size()>3 && str[0]=='-' && str[1]=='-'); }
-    
-    inline bool is_short_option(const std::string& str)
-    { return (str.size()==2 && str[0]=='-' && isalpha(str[1])); }
-
+    bool is_long_option(const std::string& str);
+    bool is_short_option(const std::string& str);
     void print_try_help(void) const;
     std::string split(std::string&, char) const;
     bool update(const std::string& key, const std::string& value);
-
 
     typedef std::map<std::string, Option*> key2option;

trunk/yat/utility/Exception.h

@@ -42 +42 @@
     /// Default constructor
     ///
-    IO_error(void) throw() : std::runtime_error("IO_error:") {}
+    inline IO_error(void) throw() : std::runtime_error("IO_error:") {}
 
     ///
     /// Constructor for exception with message
     ///
-    IO_error(std::string message) throw()
+    inline IO_error(std::string message) throw()
       : std::runtime_error("IO_error: " + message) {}
   };

trunk/yat/utility/NNI.cc

@@ -75 +75 @@
 
 
+  const utility::matrix& NNI::imputed_data(void) const
+  {
+    return imputed_data_;
+  }
+
+
+  const std::vector<size_t>& NNI::not_imputed(void) const
+  {
+    return not_imputed_;
+  }
+
 
   // Contributing nearest neighbours are added up to the user set
@@ -92 +103 @@
   }
 
-
 }}} // of namespace utility, yat, and theplu

trunk/yat/utility/NNI.h

@@ -103 +103 @@
     /// @return A const reference to the modified data.
     ///
-    const utility::matrix& imputed_data(void) const { return imputed_data_; }
+    const utility::matrix& imputed_data(void) const;
 
     ///
     /// @return indices of rows in data matrix not imputed
     ///
-    inline std::vector<size_t> not_imputed(void) const { return not_imputed_; }
+    const std::vector<size_t>& not_imputed(void) const;
 
   protected: